Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java

README.md

@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.1</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.2</h1>
 <h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.1-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.2-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 

demo/.gitignore

@@ -0,0 +1,33 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

demo/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

demo/mvnw

@@ -0,0 +1,316 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

demo/mvnw.cmd

@@ -0,0 +1,188 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%

demo/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.7.0</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.example</groupId>
+	<artifactId>demo</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<name>demo</name>
+	<description>Demo project for Spring Boot</description>
+	<properties>
+		<java.version>11</java.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

demo/src/main/java/com/example/demo/DemoApplication.java

@@ -0,0 +1,13 @@
+package com.example.demo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class DemoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(DemoApplication.class, args);
+	}
+
+}

demo/src/main/resources/application.properties

@@ -0,0 +1 @@
+

demo/src/test/java/com/example/demo/DemoApplicationTests.java

@@ -0,0 +1,13 @@
+package com.example.demo;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class DemoApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}

pom.xml

@@ -16,7 +16,7 @@
         <ruoyi.version>3.8.2</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <druid.version>1.2.8</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
@@ -25,8 +25,7 @@
         <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.4.1</pagehelper.boot.version>
         <fastjson.version>1.2.80</fastjson.version>
-        <oshi.version>6.1.2</oshi.version>
+        <oshi.version>6.1.6</oshi.version>
-        <jna.version>5.10.0</jna.version>
         <commons.io.version>2.11.0</commons.io.version>
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <commons.collections.version>3.2.2</commons.collections.version>
@@ -43,7 +42,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.5.11</version>
+                <version>2.5.13</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -83,18 +82,6 @@
                 <version>${oshi.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>net.java.dev.jna</groupId>
-                <artifactId>jna</artifactId>
-                <version>${jna.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>net.java.dev.jna</groupId>
-                <artifactId>jna-platform</artifactId>
-                <version>${jna.version}</version>
-            </dependency>
-
             <!-- Swagger3依赖 -->
             <dependency>
                 <groupId>io.springfox</groupId>

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -1,5 +1,6 @@
 package com.ruoyi;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -10,17 +11,18 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ruoyi
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
+@MapperScan("com.ruoyi.system.mapper_yada")
 public class RuoYiApplication
 {
     public static void main(String[] args)
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        System.out.println("(♥◠‿◠)ﾉﾞ  我们一起学喵叫   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
+                " |  _ _   \\   喵   \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
+                " | ( ' )  |   喵    \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
+                " |(_ o _) /     喵   _( )_ .'         \n" +
                 " | (_,_).' __  ___(_ o _)'          \n" +
                 " |  |\\ \\  |  ||   |(_,_)'         \n" +
                 " |  | \\ `'   /|   `-'  /           \n" +

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -8,8 +8,11 @@ import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.config.RuoYiConfig;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.google.code.kaptcha.Producer;
 import com.ruoyi.common.constant.Constants;
@@ -33,10 +36,10 @@ public class CaptchaController
     @Resource(name = "captchaProducerMath")
     private Producer captchaProducerMath;
 
-    @Autowired
+    @Resource
     private RedisCache redisCache;
     
-    @Autowired
+    @Resource
     private ISysConfigService configService;
     /**
      * 生成验证码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.AorestCoverageVO;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.service_yada.IAorestCoverageService;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *  森林覆盖率
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:08
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8")
+public class AorestCoverageController {
+    @Resource
+    private IAorestCoverageService service;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.POST})
+    public AjaxResult selectAorestCoverage(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<AorestCoverageVO> eastVOSList= service.selectAorestCoverage();
+        return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.POST})
+    public AjaxResult DelAorestCoverage(@Param("ID") String ID)
+    {
+        int NUM = service.DelAorestCoverage(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoAorestCoverage",method = {RequestMethod.POST})
+    public AjaxResult IntoAorestCoverage(AorestCoverageVO eastVOS)
+    {
+        int NUM =  service.IntoAorestCoverage(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *  澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:08
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/Australia", produces = "application/json;charset=UTF-8")
+public class AustraliaMiddleEastController
+{
+    @Resource
+    private IAustraliaMiddleEastService australiaMiddleEastService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
+    public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
+             return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
+    public AjaxResult DelAustralia(@Param("ID") String ID)
+    {
+        int NUM = australiaMiddleEastService.DelAustralia(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
+    public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS)
+    {
+        int NUM =  australiaMiddleEastService.IntoAustralia(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.GlobalTypeVO;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IGlobalTypeService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *全球各类型占比
+     * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:05
+ */
+@RestController
+@RequestMapping("/monitor/clobal")
+public class GlobalTypeController {
+    @Resource
+    private IGlobalTypeService typeService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST})
+    public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<GlobalTypeVO> eastVOSList= typeService.selectGlobalType();
+        return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelGlobalType",method = {RequestMethod.POST})
+    public AjaxResult DelGlobalType(@Param("ID") String ID)
+    {
+        int NUM = typeService.DelGlobalType(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoGlobalType",method = {RequestMethod.POST})
+    public AjaxResult IntoGlobalType(GlobalTypeVO eastVOS)
+    {
+        int NUM =  typeService.IntoGlobalType(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IOceanTemperatureService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 海洋表面温度监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:13
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8")
+public class OceanTemperatureController {
+    @Resource
+    private IOceanTemperatureService temperatureService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/selectOcean",method = {RequestMethod.POST})
+    public AjaxResult selectOcean(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<OceanTemperatureVO> eastVOSList= temperatureService.selectOcean();
+        return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelOcean",method = {RequestMethod.POST})
+    public AjaxResult DelOcean(@Param("ID") String ID)
+    {
+        int NUM = temperatureService.DelOcean(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
+    public AjaxResult IntoOcean(OceanTemperatureVO eastVOS)
+    {
+        int NUM =  temperatureService.IntoOcean(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.service_yada.IRegionVGIService;
+import com.ruoyi.system.domain_yada.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ *  各区域VGI
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:08
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8")
+public class RegionVGIController
+{
+    @Resource
+    private IRegionVGIService regionVGIService;
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/SelectRegion",method = {RequestMethod.POST})
+    public AjaxResult SelectRegion(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<RegionVGIVO> vgivost= regionVGIService.selectRegion();
+        return AjaxResult.success(vgivost);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelRegion",method = {RequestMethod.POST})
+    public AjaxResult DelRegion(@Param("ID") String ID)
+    {
+        int NUM = regionVGIService.DelRegion(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param vgivo
+     * @return
+     */
+    @RequestMapping(value = "/IntoRegion",method = {RequestMethod.POST})
+    public AjaxResult IntoRegion(RegionVGIVO vgivo)
+    {
+        int NUM =  regionVGIService.IntoRegion(vgivo);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java

@@ -0,0 +1,76 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.RegionVGIVO;
+import com.ruoyi.system.domain_yada.RegionalSystemVO;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IRegionalSystemService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 区域生态系统
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 9:12
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8")
+public class RegionalSystemController {
+    @Resource
+    private IRegionalSystemService systemService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/selectRegional",method = {RequestMethod.POST})
+    public AjaxResult selectRegional(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<RegionalSystemVO> eastVOSList= systemService.selectRegional();
+        return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelRegional",method = {RequestMethod.POST})
+    public AjaxResult DelRegional(@Param("ID") String ID)
+    {
+        int NUM = systemService.DelRegional(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoRegional",method = {RequestMethod.POST})
+    public AjaxResult IntoRegional(RegionalSystemVO eastVOS)
+    {
+        int NUM =  systemService.IntoRegional(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java

@@ -0,0 +1,9 @@
+package com.ruoyi.web.controller.yada;
+
+/**
+ * 专题报告
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:10
+ */
+public class SpecialReportController {
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java

@@ -0,0 +1,70 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.ThematicMapDomain;
+import com.ruoyi.system.service_yada.ThematicMapService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 中国城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 10:55
+ */
+@RestController
+@RequestMapping(value = "/thematic-map")
+public class ThematicMapController {
+
+    @Resource
+    private ThematicMapService thematicMapService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/get/all",method = {RequestMethod.GET})
+    public AjaxResult selectAllThematicMap(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<ThematicMapDomain> res= thematicMapService.selectAll();
+        return AjaxResult.success(res);
+    }
+
+    /**
+     * 删除方法
+     * @param id
+     * @return
+     */
+    @RequestMapping(value = "/delete",method = {RequestMethod.DELETE})
+    public AjaxResult deleteThematicMap(@Param("id") Long id)
+    {
+        int num = thematicMapService.deleteById(id);
+        if (num>0) {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+
+    /**
+     * 新增方法
+     * @param thematicMapDomain
+     * @return
+     */
+    @RequestMapping(value = "/add",method = {RequestMethod.POST})
+    public AjaxResult saveThematicMap(ThematicMapDomain thematicMapDomain)
+    {
+        int num = thematicMapService.save(thematicMapDomain);
+        if (num>0) {
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.UrbanVO;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IUrbanService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 中国城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 10:55
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/Urban", produces = "application/json;charset=UTF-8")
+public class UrbanController {
+    @Resource
+    private IUrbanService urbanService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/selectUrban",method = {RequestMethod.POST})
+    public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<UrbanVO> eastVOSList= urbanService.selectUrban();
+        return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelUrban",method = {RequestMethod.POST})
+    public AjaxResult DelUrban(@Param("ID") String ID)
+    {
+        int NUM = urbanService.DelUrban(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoUrban",method = {RequestMethod.POST})
+    public AjaxResult IntoUrban(UrbanVO eastVOS)
+    {
+        int NUM =  urbanService.IntoUrban(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java

@@ -0,0 +1,75 @@
+package com.ruoyi.web.controller.yada;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.service_yada.IVegetationCoverageService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 平均植被覆盖度和净初级生产力
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 10:56
+ */
+@RestController
+@RequestMapping(value = "/business-service/api/Vegetation", produces = "application/json;charset=UTF-8")
+public class VegetationCoverageController {
+    @Resource
+    private IVegetationCoverageService coverageService;
+
+    /**
+     * 查询方法
+     * @param response
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/selectVegetation",method = {RequestMethod.POST})
+    public AjaxResult selectVegetation(HttpServletResponse response, HttpServletRequest request)
+    {
+        List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation();
+        return AjaxResult.success(eastVOSList);
+    }
+
+    /**
+     * 删除方法
+     * @param ID
+     * @return
+     */
+    @RequestMapping(value = "/DelVegetation",method = {RequestMethod.POST})
+    public AjaxResult DelVegetation(@Param("ID") String ID)
+    {
+        int NUM = coverageService.DelVegetation(ID);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+
+    }
+
+    /**
+     * 新增方法
+     * @param eastVOS
+     * @return
+     */
+    @RequestMapping(value = "/IntoVegetation",method = {RequestMethod.POST})
+    public AjaxResult IntoVegetation(VegetationCoverageVO eastVOS)
+    {
+        int NUM =  coverageService.IntoVegetation(eastVOS);
+        if (NUM>0)
+        {
+            return AjaxResult.success();
+        }
+        return  AjaxResult.error();
+    }
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.2.9:3306/nuoyi?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
+                username: saas
-                password: password
+                password: XKrs123.
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/application.yml

@@ -41,12 +41,15 @@ logging:
 
 # Spring配置
 spring:
+#  config:
+#    activate:
+#      on-profile: druid
+  profiles:
+    active: druid
   # 资源信息
   messages:
     # 国际化资源文件路径
     basename: i18n/messages
-  profiles: 
-    active: druid
   # 文件上传
   servlet:
      multipart:
@@ -66,9 +69,9 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 3
     # 密码
-    password: 
+    password: sdust2020
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -94,9 +97,9 @@ token:
 # MyBatis配置
 mybatis:
     # 搜索指定包别名
-    typeAliasesPackage: com.ruoyi.**.domain
+    typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada
     # 配置mapper的扫描，找到所有的mapper.xml映射文件
-    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml
     # 加载全局的配置文件
     configLocation: classpath:mybatis/mybatis-config.xml
 
@@ -113,6 +116,7 @@ swagger:
   # 请求前缀
   pathMapping: /dev-api
 
+
 # 防止XSS攻击
 xss:
   # 过滤开关

ruoyi-admin/src/main/resources/banner.txt

@@ -2,7 +2,7 @@ Application Version: ${ruoyi.version}
 Spring Boot Version: ${spring-boot.version}
 ////////////////////////////////////////////////////////////////////
 //                          _ooOoo_                               //
-//                         o8888888o                              //
+//                         o6666666o                              //
 //                         88" . "88                              //
 //                         (| ^_^ |)                              //
 //                         O\  =  /O                              //

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

@@ -5,6 +5,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
 import com.ruoyi.common.utils.poi.ExcelHandlerAdapter;
 
 /**
@@ -56,11 +58,6 @@ public @interface Excel
      */
     public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
-    /**
-     * 导出类型（0数字 1字符串）
-     */
-    public ColumnType cellType() default ColumnType.STRING;
-
     /**
      * 导出时在excel中每个列的高度 单位为字符
      */
@@ -107,9 +104,19 @@ public @interface Excel
     public boolean isStatistics() default false;
 
     /**
-     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
+     * 导出类型（0数字 1字符串）
      */
-    public Align align() default Align.AUTO;
+    public ColumnType cellType() default ColumnType.STRING;
+
+    /**
+     * 导出字体颜色
+     */
+    public IndexedColors color() default IndexedColors.BLACK;
+
+    /**
+     * 导出字段对齐方式
+     */
+    public HorizontalAlignment align() default HorizontalAlignment.CENTER;
 
     /**
      * 自定义数据处理器

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -31,7 +32,7 @@ public class SysDept extends BaseEntity
     private String deptName;
 
     /** 显示顺序 */
-    private String orderNum;
+    private Integer orderNum;
 
     /** 负责人 */
     private String leader;
@@ -96,13 +97,13 @@ public class SysDept extends BaseEntity
         this.deptName = deptName;
     }
 
-    @NotBlank(message = "显示顺序不能为空")
+    @NotNull(message = "显示顺序不能为空")
-    public String getOrderNum()
+    public Integer getOrderNum()
     {
         return orderNum;
     }
 
-    public void setOrderNum(String orderNum)
+    public void setOrderNum(Integer orderNum)
     {
         this.orderNum = orderNum;
     }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.core.domain.entity;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -57,6 +58,7 @@ public class SysDictType extends BaseEntity
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
+    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
     public String getDictType()
     {
         return dictType;

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java

@@ -1,5 +1,6 @@
 package com.ruoyi.common.core.page;
 
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.ServletUtils;
 
 /**
@@ -40,8 +41,8 @@ public class TableSupport
     public static PageDomain getPageDomain()
     {
         PageDomain pageDomain = new PageDomain();
-        pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
+        pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1));
-        pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
+        pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10));
         pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
         pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
         pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));

ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -15,17 +15,15 @@ public class PageUtils extends PageHelper
     /**
      * 设置请求分页数据
      */
-    public static void startPage()
+    public static void
+    startPage()
     {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
+        String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-        {
+        Boolean reasonable = pageDomain.getReasonable();
-            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+        PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
-            Boolean reasonable = pageDomain.getReasonable();
-            PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
-        }
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

@@ -17,6 +17,7 @@ import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import org.apache.commons.io.FilenameUtils;
 
 /**
  * 文件处理工具类
@@ -256,7 +257,7 @@ public class FileUtils
     }
 
     /**
-     * 获取名称
+     * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
      * 
      * @param fileName 路径名称
      * @return 没有文件路径的名称
@@ -272,4 +273,21 @@ public class FileUtils
         int index = Math.max(lastUnixPos, lastWindowsPos);
         return fileName.substring(index + 1);
     }
+
+    /**
+     * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi
+     * 
+     * @param fileName 路径名称
+     * @return 没有文件路径和后缀的名称
+     */
+    public static String getNameNotSuffix(String fileName)
+    {
+        if (fileName == null)
+        {
+            return null;
+        }
+        String baseName = FilenameUtils.getBaseName(fileName);
+        return baseName;
+    }
+
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -672,21 +672,46 @@ public class ExcelUtil<T>
         style.setFont(totalFont);
         styles.put("total", style);
 
-        style = wb.createCellStyle();
+        styles.putAll(annotationStyles(wb));
-        style.cloneStyleFrom(styles.get("data"));
-        style.setAlignment(HorizontalAlignment.LEFT);
-        styles.put("data1", style);
 
-        style = wb.createCellStyle();
+        return styles;
-        style.cloneStyleFrom(styles.get("data"));
+    }
-        style.setAlignment(HorizontalAlignment.CENTER);
-        styles.put("data2", style);
-
-        style = wb.createCellStyle();
-        style.cloneStyleFrom(styles.get("data"));
-        style.setAlignment(HorizontalAlignment.RIGHT);
-        styles.put("data3", style);
 
+    /**
+     * 根据Excel注解创建表格样式
+     * 
+     * @param wb 工作薄对象
+     * @return 自定义样式列表
+     */
+    private Map<String, CellStyle> annotationStyles(Workbook wb)
+    {
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        for (Object[] os : fields)
+        {
+            Excel excel = (Excel) os[1];
+            String key = "data_" + excel.align() + "_" + excel.color();
+            if (!styles.containsKey(key))
+            {
+                CellStyle style = wb.createCellStyle();
+                style = wb.createCellStyle();
+                style.setAlignment(excel.align());
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
+                style.setBorderRight(BorderStyle.THIN);
+                style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderLeft(BorderStyle.THIN);
+                style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderTop(BorderStyle.THIN);
+                style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                style.setBorderBottom(BorderStyle.THIN);
+                style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+                Font dataFont = wb.createFont();
+                dataFont.setFontName("Arial");
+                dataFont.setFontHeightInPoints((short) 10);
+                dataFont.setColor(excel.color().index);
+                style.setFont(dataFont);
+                styles.put(key, style);
+            }
+        }
         return styles;
     }
 
@@ -786,17 +811,10 @@ public class ExcelUtil<T>
             // 设置列宽
             sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
         }
-        // 如果设置了提示信息则鼠标放上去提示.
+        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
-        if (StringUtils.isNotEmpty(attr.prompt()))
         {
-            // 这里默认设了2-101列提示.
+            // 提示信息或只能选择不能输入的列内容.
-            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+            setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
-        }
-        // 如果设置了combo属性则本列只能选择不能输入
-        if (attr.combo().length > 0)
-        {
-            // 这里默认设了2-101列只能选择不能输入.
-            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
         }
     }
 
@@ -815,8 +833,7 @@ public class ExcelUtil<T>
             {
                 // 创建cell
                 cell = row.createCell(column);
-                int align = attr.align().value();
+                cell.setCellStyle(styles.get("data_" + attr.align() + "_" + attr.color()));
-                cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
 
                 // 用于读取对象中的属性
                 Object value = getTargetValue(vo, field, attr);
@@ -860,48 +877,29 @@ public class ExcelUtil<T>
     }
 
     /**
-     * 设置 POI XSSFSheet 单元格提示
+     * 设置 POI XSSFSheet 单元格提示或选择框
      * 
      * @param sheet 表单
-     * @param promptTitle 提示标题
+     * @param textlist 下拉框显示的内容
      * @param promptContent 提示内容
      * @param firstRow 开始行
      * @param endRow 结束行
      * @param firstCol 开始列
      * @param endCol 结束列
      */
-    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
+    public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow,
             int firstCol, int endCol)
     {
         DataValidationHelper helper = sheet.getDataValidationHelper();
-        DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
+        DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         DataValidation dataValidation = helper.createValidation(constraint, regions);
-        dataValidation.createPromptBox(promptTitle, promptContent);
+        if (StringUtils.isNotEmpty(promptContent))
-        dataValidation.setShowPromptBox(true);
+        {
-        sheet.addValidationData(dataValidation);
+            // 如果设置了提示信息则鼠标放上去提示
-    }
+            dataValidation.createPromptBox("", promptContent);
-
+            dataValidation.setShowPromptBox(true);
-    /**
+        }
-     * 设置某些列的值只能输入预制的数据,显示下拉框.
-     * 
-     * @param sheet 要设置的sheet.
-     * @param textlist 下拉框显示的内容
-     * @param firstRow 开始行
-     * @param endRow 结束行
-     * @param firstCol 开始列
-     * @param endCol 结束列
-     * @return 设置好的sheet.
-     */
-    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol)
-    {
-        DataValidationHelper helper = sheet.getDataValidationHelper();
-        // 加载下拉列表内容
-        DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
-        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
-        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
-        // 数据有效性对象
-        DataValidation dataValidation = helper.createValidation(constraint, regions);
         // 处理Excel兼容性问题
         if (dataValidation instanceof XSSFDataValidation)
         {
@@ -912,7 +910,6 @@ public class ExcelUtil<T>
         {
             dataValidation.setSuppressDropDownArrow(false);
         }
-
         sheet.addValidationData(dataValidation);
     }
 

ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -78,14 +78,24 @@
           v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table
+      v-if="refreshTable"
       v-loading="loading"
       :data="${businessName}List"
       row-key="${treeCode}"
-      default-expand-all
+      :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 #foreach($column in $columns)
@@ -293,6 +303,10 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
@@ -423,6 +437,14 @@ export default {
       this.open = true;
       this.title = "添加${functionName}";
     },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();

ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm

@@ -76,14 +76,23 @@
           v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Sort"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table
+      v-if="refreshTable"
       v-loading="loading"
       :data="${businessName}List"
       row-key="${treeCode}"
-      default-expand-all
+      :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
 #foreach($column in $columns)
@@ -165,11 +174,13 @@
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
         <el-form-item label="${comment}" prop="${treeParentCode}">
-          <tree-select
+          <el-tree-select
-            v-model:value="form.${treeParentCode}"
+            v-model="form.${treeParentCode}"
-            :options="${businessName}Options"
+            :data="${businessName}Options"
-            :objMap="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            value-key="${treeCode}"
             placeholder="请选择${comment}"
+            check-strictly
           />
         </el-form-item>
 #elseif($column.htmlType == "input")
@@ -283,6 +294,8 @@ const open = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const title = ref("");
+const isExpandAll = ref(true);
+const refreshTable = ref(true);
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
@@ -343,8 +356,8 @@ function getList() {
 }
 
 /** 查询${functionName}下拉树结构 */
-async function getTreeselect() {
+function getTreeselect() {
-  await list${BusinessName}().then(response => {
+  list${BusinessName}().then(response => {
     ${businessName}Options.value = [];
     const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
     data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
@@ -393,9 +406,9 @@ function resetQuery() {
 }
 
 /** 新增按钮操作 */
-async function handleAdd(row) {
+function handleAdd(row) {
   reset();
-  await getTreeselect();
+  getTreeselect();
   if (row != null && row.${treeCode}) {
     form.value.${treeParentCode} = row.${treeCode};
   } else {
@@ -405,6 +418,15 @@ async function handleAdd(row) {
   title.value = "添加${functionName}";
 }
 
+/** 展开/折叠操作 */
+function toggleExpandAll() {
+  refreshTable.value = false;
+  isExpandAll.value = !isExpandAll.value;
+  nextTick(() => {
+    refreshTable.value = true;
+  });
+}
+
 /** 修改按钮操作 */
 async function handleUpdate(row) {
   reset();

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java

@@ -15,6 +15,7 @@ import com.ruoyi.common.constant.ScheduleConstants;
 import com.ruoyi.common.exception.job.TaskException;
 import com.ruoyi.common.exception.job.TaskException.Code;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.quartz.domain.SysJob;
 
 /**
@@ -127,6 +128,7 @@ public class ScheduleUtils
         {
             return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR);
         }
-        return true;
+        Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
+        return StringUtils.containsAnyIgnoreCase(obj.getClass().getPackage().getName(), Constants.JOB_WHITELIST_STR);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java

@@ -0,0 +1,89 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * 森林覆盖率
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:06
+ */
+public class AorestCoverageVO extends  SysBaseEntity {
+
+    private  String id;
+
+    private  String particularYear;
+
+    private  String region;
+
+    private  String regionEn;
+
+    private  Double protectedLands;
+
+    private  Double nonProtectedLands;
+
+    private  Double mountain;
+
+    private  Double nonMountain;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public Double getProtectedLands() {
+        return protectedLands;
+    }
+
+    public void setProtectedLands(Double protectedLands) {
+        this.protectedLands = protectedLands;
+    }
+
+    public Double getNonProtectedLands() {
+        return nonProtectedLands;
+    }
+
+    public void setNonProtectedLands(Double nonProtectedLands) {
+        this.nonProtectedLands = nonProtectedLands;
+    }
+
+    public Double getMountain() {
+        return mountain;
+    }
+
+    public void setMountain(Double mountain) {
+        this.mountain = mountain;
+    }
+
+    public Double getNonMountain() {
+        return nonMountain;
+    }
+
+    public void setNonMountain(Double nonMountain) {
+        this.nonMountain = nonMountain;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java

@@ -0,0 +1,90 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/19 14:50
+ */
+public class AustraliaMiddleEastVO extends SysBaseEntity
+{
+    private  String id;
+
+    private LocalDate yearMonth;
+
+    private  Double sstAnomalyIndex;
+
+    private  Double temperatureAnomolies;
+
+    private  Double  precipitationAnomolies;
+
+    private  Double vaiAnomolies;
+
+    private  String createdBy;
+
+    private  LocalDate createdTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public LocalDate getYearMonth() {
+        return yearMonth;
+    }
+
+    public void setYearMonth(LocalDate yearMonth) {
+        this.yearMonth = yearMonth;
+    }
+
+    public Double getSstAnomalyIndex() {
+        return sstAnomalyIndex;
+    }
+
+    public void setSstAnomalyIndex(Double sstAnomalyIndex) {
+        this.sstAnomalyIndex = sstAnomalyIndex;
+    }
+
+    public Double getTemperatureAnomolies() {
+        return temperatureAnomolies;
+    }
+
+    public void setTemperatureAnomolies(Double temperatureAnomolies) {
+        this.temperatureAnomolies = temperatureAnomolies;
+    }
+
+    public Double getPrecipitationAnomolies() {
+        return precipitationAnomolies;
+    }
+
+    public void setPrecipitationAnomolies(Double precipitationAnomolies) {
+        this.precipitationAnomolies = precipitationAnomolies;
+    }
+
+    public Double getVaiAnomolies() {
+        return vaiAnomolies;
+    }
+
+    public void setVaiAnomolies(Double vaiAnomolies) {
+        this.vaiAnomolies = vaiAnomolies;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public LocalDate getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(LocalDate createdTime) {
+        this.createdTime = createdTime;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java

@@ -0,0 +1,69 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * 全球各类型占比
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:07
+ */
+public class GlobalTypeVO extends  SysBaseEntity {
+
+    private  String id;
+
+    private  String typeName;
+
+    private  String  typeNameEn;
+
+    private  Double areaProportion;
+
+    private  String area;
+
+    private  int  particularYear;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTypeNameEn() {
+        return typeNameEn;
+    }
+
+    public void setTypeNameEn(String typeNameEn) {
+        this.typeNameEn = typeNameEn;
+    }
+
+    public Double getAreaProportion() {
+        return areaProportion;
+    }
+
+    public void setAreaProportion(Double areaProportion) {
+        this.areaProportion = areaProportion;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public int getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(int particularYear) {
+        this.particularYear = particularYear;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**+
+ * 海面温度监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:08
+ */
+public class OceanTemperatureVO extends SysBaseEntity
+{
+
+    private  String id;
+
+    private  Integer ninoPhenomenon;
+
+    private  Integer  laNina;
+
+    private LocalDate startDate;
+
+    private  LocalDate endDate;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getNinoPhenomenon() {
+        return ninoPhenomenon;
+    }
+
+    public void setNinoPhenomenon(Integer ninoPhenomenon) {
+        this.ninoPhenomenon = ninoPhenomenon;
+    }
+
+    public Integer getLaNina() {
+        return laNina;
+    }
+
+    public void setLaNina(Integer laNina) {
+        this.laNina = laNina;
+    }
+
+    public LocalDate getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(LocalDate startDate) {
+        this.startDate = startDate;
+    }
+
+    public LocalDate getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(LocalDate endDate) {
+        this.endDate = endDate;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.domain_yada;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/19 16:53
+ */
+public class RegionVGIVO implements Serializable {
+    private  String id;
+
+    private  String region;
+
+    private  String regionEn;
+
+    private  String typeName;
+
+    private  String typeNameEn;
+
+    private  Double forest;
+
+    private  Double grassland;
+
+    private  Integer particularYear;
+
+    private  String createdBy;
+
+    private LocalDate createdTime;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getTypeNameEn() {
+        return typeNameEn;
+    }
+
+    public void setTypeNameEn(String typeNameEn) {
+        this.typeNameEn = typeNameEn;
+    }
+
+    public Double getForest() {
+        return forest;
+    }
+
+    public void setForest(Double forest) {
+        this.forest = forest;
+    }
+
+    public Double getGrassland() {
+        return grassland;
+    }
+
+    public void setGrassland(Double grassland) {
+        this.grassland = grassland;
+    }
+
+    public Integer getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(Integer particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public LocalDate getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(LocalDate createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    @Override
+    public String toString() {
+        return "RegionVGIVO{" +
+                "id='" + id + '\'' +
+                ", region='" + region + '\'' +
+                ", regionEn='" + regionEn + '\'' +
+                ", typeName='" + typeName + '\'' +
+                ", typeNameEn='" + typeNameEn + '\'' +
+                ", forest=" + forest +
+                ", grassland=" + grassland +
+                ", particularYear=" + particularYear +
+                ", createdBy='" + createdBy + '\'' +
+                ", createdTime=" + createdTime +
+                '}';
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java

@@ -0,0 +1,80 @@
+package com.ruoyi.system.domain_yada;
+
+/**
+ * 区域生态系统
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:09
+ */
+
+public class RegionalSystemVO  extends SysBaseEntity{
+
+    private  String id;
+
+    private  String region;
+
+    private  String  regionEn;
+
+    private  String typeConversion;
+
+    private  String typeconversionEn;
+
+    private  Double  proportionOfChangedAreas;
+
+    private  String particularYear;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public String getTypeConversion() {
+        return typeConversion;
+    }
+
+    public void setTypeConversion(String typeConversion) {
+        this.typeConversion = typeConversion;
+    }
+
+    public String getTypeconversionEn() {
+        return typeconversionEn;
+    }
+
+    public void setTypeconversionEn(String typeconversionEn) {
+        this.typeconversionEn = typeconversionEn;
+    }
+
+    public Double getProportionOfChangedAreas() {
+        return proportionOfChangedAreas;
+    }
+
+    public void setProportionOfChangedAreas(Double proportionOfChangedAreas) {
+        this.proportionOfChangedAreas = proportionOfChangedAreas;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java

@@ -0,0 +1,95 @@
+package com.ruoyi.system.domain_yada;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Entity基类
+ * 
+ * @author ruoyi
+ */
+public class SysBaseEntity implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    private LocalDateTime createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    private LocalDateTime updateTime;
+
+    /** 备注 */
+    private String remark;
+
+    /** 请求参数 */
+    private Map<String, Object> params;
+
+    public String getCreateBy()
+    {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy)
+    {
+        this.createBy = createBy;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy()
+    {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy)
+    {
+        this.updateBy = updateBy;
+    }
+
+    public LocalDateTime getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(LocalDateTime updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params)
+    {
+        this.params = params;
+    }
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java

@@ -0,0 +1,146 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDateTime;
+
+/**
+ * 专题图实体类
+ * @Author: taco chen
+ * @Date: 2022/5/20 14:09
+ */
+public class ThematicMapDomain extends SysBaseEntity {
+
+    private Long id;
+
+    private String pictureZh;
+
+    private String pictureEn;
+
+    private String pictureName;
+
+    private String pictureType;
+
+    private LocalDateTime pictureTime;
+
+    private String picturePath;
+
+    private String remarks;
+
+    private String createdBy;
+
+    private LocalDateTime createdTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getPictureZh() {
+        return pictureZh;
+    }
+
+    public void setPictureZh(String pictureZh) {
+        this.pictureZh = pictureZh;
+    }
+
+    public String getPictureEn() {
+        return pictureEn;
+    }
+
+    public void setPictureEn(String pictureEn) {
+        this.pictureEn = pictureEn;
+    }
+
+    public String getPictureName() {
+        return pictureName;
+    }
+
+    public void setPictureName(String pictureName) {
+        this.pictureName = pictureName;
+    }
+
+    public String getPictureType() {
+        return pictureType;
+    }
+
+    public void setPictureType(String pictureType) {
+        this.pictureType = pictureType;
+    }
+
+    public LocalDateTime getPictureTime() {
+        return pictureTime;
+    }
+
+    public void setPictureTime(LocalDateTime pictureTime) {
+        this.pictureTime = pictureTime;
+    }
+
+    public String getPicturePath() {
+        return picturePath;
+    }
+
+    public void setPicturePath(String picturePath) {
+        this.picturePath = picturePath;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+<<<<<<< HEAD
+
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
+    public LocalDateTime getCreatedTime() {
+        return createdTime;
+    }
+
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
+    public void setCreatedTime(LocalDateTime createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ThematicMapDomain{" +
+                "id=" + id +
+                ", pictureZh='" + pictureZh + '\'' +
+                ", pictureEn='" + pictureEn + '\'' +
+                ", pictureName='" + pictureName + '\'' +
+                ", pictureType='" + pictureType + '\'' +
+                ", pictureTime=" + pictureTime +
+                ", picturePath='" + picturePath + '\'' +
+                ", remarks='" + remarks + '\'' +
+                ", createdBy='" + createdBy + '\'' +
+                ", createdTime=" + createdTime +
+                '}';
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UrbanVO.java

@@ -0,0 +1,61 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**
+ * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 16:55
+ */
+public class UrbanVO extends SysBaseEntity{
+
+    private  String id;
+
+    private String particularYear;
+
+    private  String name;
+
+    private  String  nameEn;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
+    public Double getUrbanArea() {
+        return urbanArea;
+    }
+
+    public void setUrbanArea(Double urbanArea) {
+        this.urbanArea = urbanArea;
+    }
+
+    private  Double urbanArea;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java

@@ -0,0 +1,91 @@
+package com.ruoyi.system.domain_yada;
+
+import java.time.LocalDate;
+
+/**
+ * 平均植被覆盖度和净初级生产力
+ * @Author: JinSheng Song
+ * @Date: 2022/5/20 14:09
+ */
+public class VegetationCoverageVO extends SysBaseEntity
+{
+    private  String id;
+
+    private  String region;
+
+    private  String regionEn;
+
+    private  String particularYear;
+
+    private  Double mountain;
+
+    private  Double nonMountain;
+
+    private  Double protectedLands;
+
+    private  Double nonProtectedLands;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getRegionEn() {
+        return regionEn;
+    }
+
+    public void setRegionEn(String regionEn) {
+        this.regionEn = regionEn;
+    }
+
+    public String getParticularYear() {
+        return particularYear;
+    }
+
+    public void setParticularYear(String particularYear) {
+        this.particularYear = particularYear;
+    }
+
+    public Double getMountain() {
+        return mountain;
+    }
+
+    public void setMountain(Double mountain) {
+        this.mountain = mountain;
+    }
+
+    public Double getNonMountain() {
+        return nonMountain;
+    }
+
+    public void setNonMountain(Double nonMountain) {
+        this.nonMountain = nonMountain;
+    }
+
+    public Double getProtectedLands() {
+        return protectedLands;
+    }
+
+    public void setProtectedLands(Double protectedLands) {
+        this.protectedLands = protectedLands;
+    }
+
+    public Double getNonProtectedLands() {
+        return nonProtectedLands;
+    }
+
+    public void setNonProtectedLands(Double nonProtectedLands) {
+        this.nonProtectedLands = nonProtectedLands;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java

@@ -0,0 +1,19 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.AorestCoverageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AorestCoverageMapper {
+
+    List<AorestCoverageVO> selectAorestCoverage();
+
+    Integer DelAorestCoverage(@Param("id") String id);
+
+    Integer IntoAorestCoverage(AorestCoverageVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+
+
+import java.util.List;
+
+/**
+ * 澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AustraliaMiddleEastMapper {
+
+    List<AustraliaMiddleEastVO> selectAustralia();
+
+    Integer DelAustralia(@Param("id") String id);
+
+    Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java

@@ -0,0 +1,19 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.GlobalTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface GlobalTypeMapper {
+
+    List<GlobalTypeVO> selectGlobalType();
+
+    Integer DelGlobalType(@Param("id") String id);
+
+    Integer IntoGlobalType(GlobalTypeVO typeVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java

@@ -0,0 +1,22 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+@Repository
+public interface OceanTemperatureMapper {
+
+    List<OceanTemperatureVO> selectOcean();
+
+    Integer DelOcean(@Param("id") String id);
+
+    Integer IntoOcean(OceanTemperatureVO eastVO);
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java

@@ -0,0 +1,19 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface RegionVGIMapper {
+
+    List<RegionVGIVO> selectRegion();
+
+    Integer DelRegion(@Param("id") String id);
+
+    Integer IntoRegion(RegionVGIVO regionVGIVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java

@@ -0,0 +1,19 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.RegionalSystemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface RegionalSystemMapper {
+
+    List<RegionalSystemVO> selectRegional();
+
+    Integer DelRegional(@Param("id") String id);
+
+    Integer IntoRegional(RegionalSystemVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java

@@ -0,0 +1,34 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.ThematicMapDomain;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author taco chen
+ */
+public interface ThematicMapMapper {
+
+    /**
+     * 获取所有专题图
+     * @return
+     */
+    List<ThematicMapDomain> selectAllThematicMap();
+
+    /**
+     * 删除专题图根据编号
+     * @param id 编号
+     * @return
+     */
+    Integer deleteThematicMap(Long id);
+
+    /**
+     * 保存专题图
+     * @param thematicMapDomain
+     * @return
+     */
+    Integer saveThematicMap(ThematicMapDomain thematicMapDomain);
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.UrbanVO;
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface UrbanMapper {
+
+    List<UrbanVO> selectUrban();
+
+    Integer DelUrban(@Param("id") String id);
+
+    Integer IntoUrban(UrbanVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java

@@ -0,0 +1,19 @@
+package com.ruoyi.system.mapper_yada;
+
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface VegetationCoverageMapper {
+
+    List<VegetationCoverageVO> selectVegetation();
+
+    Integer DelVegetation(@Param("id") String id);
+
+    Integer IntoVegetation(VegetationCoverageVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -2,12 +2,15 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.SysConfig;
+import org.springframework.stereotype.Service;
 
 /**
  * 参数配置 服务层
  * 
  * @author ruoyi
  */
+
+
 public interface ISysConfigService
 {
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 
@@ -25,10 +26,10 @@ import java.util.List;
 @Service
 public class SysConfigServiceImpl implements ISysConfigService
 {
-    @Autowired
+    @Resource
     private SysConfigMapper configMapper;
 
-    @Autowired
+    @Resource
     private RedisCache redisCache;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AorestCoverageVO;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 森林覆盖率
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:32
+ */
+public interface IAorestCoverageService {
+
+    public List<AorestCoverageVO> selectAorestCoverage();
+
+    public Integer DelAorestCoverage(@Param("id") String id);
+
+    public Integer IntoAorestCoverage(AorestCoverageVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 澳大利亚中东部地区
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:32
+ */
+public interface IAustraliaMiddleEastService
+{
+    public  List<AustraliaMiddleEastVO> selectAustralia();
+
+    public Integer DelAustralia(@Param("id") String id);
+
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.GlobalTypeVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 全球各类型占比
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:37
+ */
+public interface IGlobalTypeService {
+
+   public List<GlobalTypeVO> selectGlobalType();
+
+   public   Integer DelGlobalType(String id);
+
+   public Integer IntoGlobalType(GlobalTypeVO typeVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 海面表面温度监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:38
+ */
+public interface IOceanTemperatureService {
+
+    public List<OceanTemperatureVO> selectOcean();
+
+    public Integer DelOcean(@Param("id") String id);
+
+    public Integer IntoOcean(OceanTemperatureVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java

@@ -0,0 +1,33 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.RegionVGIVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:34
+ */
+public interface IRegionVGIService {
+
+    /**
+     * 查询
+     * @return
+     */
+    public List<RegionVGIVO> selectRegion();
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    public Integer DelRegion(@Param("id") String id);
+
+    /**
+     * 添加
+     * @param eastVO
+     * @return
+     */
+    public Integer IntoRegion(RegionVGIVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.RegionalSystemVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 区域生态系统
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:35
+ */
+public interface IRegionalSystemService {
+
+    public List<RegionalSystemVO> selectRegional();
+
+    public Integer DelRegional(@Param("id") String id);
+
+    public Integer IntoRegional(RegionalSystemVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service_yada;
+
+/**
+ * 专题报告
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:39
+ */
+public interface ISpecialReportService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java

@@ -0,0 +1,20 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.UrbanVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:40
+ */
+public interface IUrbanService {
+
+    public List<UrbanVO> selectUrban();
+
+    public Integer DelUrban(@Param("id") String id);
+
+    public Integer IntoUrban(UrbanVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java

@@ -0,0 +1,21 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 平均植被覆盖度和净初级生产力
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:34
+ */
+public interface IVegetationCoverageService {
+
+    public List<VegetationCoverageVO> selectVegetation();
+
+    public Integer DelVegetation(String id);
+
+    public Integer IntoVegetation(VegetationCoverageVO eastVO);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java

@@ -0,0 +1,36 @@
+package com.ruoyi.system.service_yada;
+
+import com.ruoyi.system.domain_yada.ThematicMapDomain;
+
+import java.util.List;
+
+/**
+ * 专题图服务
+ * @Author: taco chen
+ * @Date: 2022/5/11 11:40
+ */
+public interface ThematicMapService {
+
+
+    /**
+     * 获取全部专题图
+     * @return
+     */
+    List<ThematicMapDomain> selectAll();
+
+    /**
+     * 删除专题图根据编号
+     * @param id 编号
+     * @return
+     */
+    Integer deleteById(Long id);
+
+    /**
+     * 保存专题图
+     * @param thematicMapDomain
+     * @return
+     */
+    Integer save(ThematicMapDomain thematicMapDomain);
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java

@@ -0,0 +1,39 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AorestCoverageVO;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.service_yada.IAorestCoverageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 森林覆盖率
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:43
+ */
+@Service
+public class AorestCoverageServiceimpl implements IAorestCoverageService {
+    @Resource
+    private AorestCoverageMapper coverageMapper;
+
+
+    @Override
+    public List<AorestCoverageVO> selectAorestCoverage() {
+        return coverageMapper.selectAorestCoverage();
+    }
+
+    @Override
+    public Integer DelAorestCoverage(String id) {
+        return coverageMapper.DelAorestCoverage(id);
+    }
+
+    @Override
+    public Integer IntoAorestCoverage(AorestCoverageVO eastVO) {
+        return IntoAorestCoverage(eastVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java

@@ -0,0 +1,39 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 亚大综合监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:43
+ */
+@Service
+public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastService
+{
+    @Resource
+    private AustraliaMiddleEastMapper australiaMiddleEastMapper;
+
+    @Override
+    public List<AustraliaMiddleEastVO> selectAustralia()
+    {
+        return australiaMiddleEastMapper.selectAustralia();
+    }
+
+    @Override
+    public Integer DelAustralia(String id) {
+        return australiaMiddleEastMapper.DelAustralia(id);
+
+    }
+
+    @Override
+    public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) {
+        return australiaMiddleEastMapper.IntoAustralia(eastVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java

@@ -0,0 +1,40 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.GlobalTypeVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.GlobalTypeMapper;
+import com.ruoyi.system.service_yada.IGlobalTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 全球各类型占比
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:47
+ */
+@Service
+public class GlobalTypeServiceimpl implements IGlobalTypeService {
+
+    @Resource
+    private GlobalTypeMapper typeMapper;
+
+
+    @Override
+    public List<GlobalTypeVO> selectGlobalType() {
+        return typeMapper.selectGlobalType();
+    }
+
+    @Override
+    public Integer DelGlobalType(String id) {
+        return typeMapper.DelGlobalType(id);
+    }
+
+    @Override
+    public Integer IntoGlobalType(GlobalTypeVO typeVO) {
+        return typeMapper.IntoGlobalType(typeVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java

@@ -0,0 +1,40 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.OceanTemperatureVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.OceanTemperatureMapper;
+import com.ruoyi.system.service_yada.IOceanTemperatureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 森林监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:47
+ */
+@Service
+public class OceanTemperatureServiceimpl implements IOceanTemperatureService {
+
+    @Resource
+    private OceanTemperatureMapper oceanMapper;
+
+
+    @Override
+    public List<OceanTemperatureVO> selectOcean() {
+        return oceanMapper.selectOcean();
+    }
+
+    @Override
+    public Integer DelOcean(String id) {
+        return oceanMapper.DelOcean(id);
+    }
+
+    @Override
+    public Integer IntoOcean(OceanTemperatureVO eastVO) {
+        return oceanMapper.IntoOcean(eastVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java

@@ -0,0 +1,37 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.mapper_yada.RegionVGIMapper;
+import com.ruoyi.system.service_yada.IRegionVGIService;
+import com.ruoyi.system.domain_yada.RegionVGIVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 大气质量监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:45
+ */
+@Service
+public class RegionVGIServiceimpl implements IRegionVGIService {
+
+    @Resource
+    private RegionVGIMapper vgiMapper;
+
+    @Override
+    public List<RegionVGIVO> selectRegion() {
+        return vgiMapper.selectRegion();
+    }
+
+    @Override
+    public Integer DelRegion(String id) {
+        return vgiMapper.DelRegion(id);
+    }
+
+    @Override
+    public Integer IntoRegion(RegionVGIVO eastVO) {
+        return vgiMapper.IntoRegion(eastVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java

@@ -0,0 +1,41 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.RegionalSystemVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.RegionalSystemMapper;
+import com.ruoyi.system.service_yada.IRegionalSystemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 区域生态系统
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:46
+ */
+@Service
+public class RegionalSystemServiceimpl implements IRegionalSystemService {
+
+    @Resource
+    private RegionalSystemMapper Regional;
+
+
+    @Override
+    public List<RegionalSystemVO> selectRegional() {
+        return Regional.selectRegional();
+    }
+
+    @Override
+    public Integer DelRegional(String id) {
+        return Regional.DelRegional(id);
+    }
+
+    @Override
+    public Integer IntoRegional(RegionalSystemVO eastVO) {
+        return Regional.IntoRegional(eastVO);
+    }
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java

@@ -0,0 +1,12 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.service_yada.ISpecialReportService;
+
+/**
+ * 专题报告
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:48
+ */
+public class SpecialReportServiceimpl  implements ISpecialReportService {
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java

@@ -0,0 +1,49 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.ThematicMapDomain;
+import com.ruoyi.system.mapper_yada.ThematicMapMapper;
+import com.ruoyi.system.service_yada.ThematicMapService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * * 专题图服务
+ * @author : taco chen
+ */
+@Service
+public class ThematicMapServiceImpl implements ThematicMapService {
+
+    @Resource
+    private ThematicMapMapper thematicMapMapper;
+
+    /**
+     * 获取全部专题图
+     * @return
+     */
+    @Override
+    public List<ThematicMapDomain> selectAll(){
+        return thematicMapMapper.selectAllThematicMap();
+    }
+
+    /**
+     * 删除专题图根据编号
+     * @param id 编号
+     * @return
+     */
+    @Override
+    public Integer deleteById(Long id){
+        return thematicMapMapper.deleteThematicMap(id);
+    }
+
+    /**
+     * 保存专题图
+     * @param thematicMapDomain
+     * @return
+     */
+    @Override
+    public Integer save(ThematicMapDomain thematicMapDomain){
+        return thematicMapMapper.saveThematicMap(thematicMapDomain);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java

@@ -0,0 +1,39 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.UrbanVO;
+import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
+import com.ruoyi.system.mapper_yada.UrbanMapper;
+import com.ruoyi.system.service_yada.IUrbanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:49
+ */
+@Service
+public class UrbanServiceimpl implements IUrbanService {
+
+    @Resource
+    private UrbanMapper urbanMapper;
+
+    @Override
+
+    public List<UrbanVO> selectUrban() {
+        return urbanMapper.selectUrban();
+    }
+
+    @Override
+    public Integer DelUrban(String id) {
+        return urbanMapper.DelUrban(id);
+    }
+
+    @Override
+    public Integer IntoUrban(UrbanVO eastVO) {
+        return urbanMapper.IntoUrban(eastVO);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java

@@ -0,0 +1,41 @@
+package com.ruoyi.system.service_yada.impl;
+
+import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
+import com.ruoyi.system.domain_yada.VegetationCoverageVO;
+import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
+import com.ruoyi.system.mapper_yada.VegetationCoverageMapper;
+import com.ruoyi.system.service_yada.IVegetationCoverageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 平均植被覆盖度和净初级生产力
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:45
+ */
+@Service
+public class VegetationCoverageServiceimpl implements IVegetationCoverageService {
+
+
+    @Resource
+    private VegetationCoverageMapper coverageMapper;
+
+
+    @Override
+    public List<VegetationCoverageVO> selectVegetation() {
+        return coverageMapper.selectVegetation();
+    }
+
+    @Override
+    public Integer DelVegetation(String id) {
+        return coverageMapper.DelVegetation(id);
+    }
+
+    @Override
+    public Integer IntoVegetation(VegetationCoverageVO eastVO) {
+        return coverageMapper.IntoVegetation(eastVO);
+    }
+}

ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.AorestCoverageMapper">
+
+    <resultMap id="RM_AorestCoverage" type="com.ruoyi.system.domain_yada.AorestCoverageVO">
+
+        <result property="id" column="id"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="region" column="region"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="protectedLands" column="protected_lands"/>
+        <result property="nonProtectedLands" column="non_protected_lands"/>
+        <result property="mountain" column="mountain"/>
+        <result property="nonMountain" column="non_mountain"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,particular_year,region,region_en,protected_lands,non_protected_lands,mountain,non_mountain,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectAorestCoverage" resultMap="RM_AorestCoverage">
+        SELECT  <include refid="columns"/>  FROM  forest_coverage;
+    </select>
+
+    <delete id="DelAorestCoverage">
+        DELETE FROM forest_coverage
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoAorestCoverage">
+        <![CDATA[
+        INSERT INTO forest_coverage (
+            id ,
+            particular_year ,
+            region ,
+            region_en ,
+            protected_lands ,
+            non_protected_lands ,
+            mountain,
+            non_mountain,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{protectedLands,jdbcType=DOUBLE},
+                     #{nonProtectedLand,jdbcType=DOUBLE},
+                     #{mountain,jdbcType=DOUBLE},
+                     #{nonMountain,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper">
+    <resultMap id="RM_AustraliaMiddleEast" type="com.ruoyi.system.domain_yada.AustraliaMiddleEastVO">
+
+        <result property="yearMonth" column="year_month"/>
+        <result property="id" column="ID"/>
+        <result property="sstAnomalyIndex" column="sst_anomaly_index"/>
+        <result property="temperatureAnomolies" column="temperature_anomolies"/>
+        <result property="precipitationAnomolies" column="precipitation_anomolies"/>
+        <result property="vaiAnomolies" column="vai_anomolies"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        ID,year_month,sst_anomaly_index,temperature_anomolies,precipitation_anomolies,vai_anomolies,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectAustralia" resultMap="RM_AustraliaMiddleEast">
+        SELECT  <include refid="columns"/>  FROM  central_and_eastern_australia;
+    </select>
+
+    <delete id="DelAustralia">
+        DELETE FROM central_and_eastern_australia
+        WHERE ID=#{id}
+    </delete>
+    
+    <insert id="IntoAustralia">
+        <![CDATA[
+        INSERT INTO central_and_eastern_australia (
+            ID ,
+            year_month ,
+            sst_anomaly_index ,
+            temperature_anomolies ,
+            precipitation_anomolies ,
+            vai_anomolies ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{yearMonth,jdbcType=DATE},
+                     #{sstAnomalyIndex,jdbcType=DOUBLE},
+                     #{temperatureAnomolies,jdbcType=DOUBLE},
+                     #{precipitationAnomolies,jdbcType=DOUBLE},
+                     #{vaiAnomolies,jdbcType=DOUBLE},
+                     #{createdBy,jdbcType=VARCHAR},
+                     #{createdTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.GlobalTypeMapper">
+
+    <resultMap id="RM_GlobalType" type="com.ruoyi.system.domain_yada.GlobalTypeVO">
+
+        <result property="id" column="id"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="typeName" column="type_name"/>
+        <result property="typeNameEn" column="type_name_en"/>
+        <result property="areaProportion" column="area_proportion"/>
+        <result property="area" column="area"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,particular_year,type_name,type_name_en,area_proportion,area,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectGlobalType" resultMap="RM_GlobalType">
+        SELECT  <include refid="columns"/>  FROM  proportion_of_global_types;
+    </select>
+
+    <delete id="DelGlobalType">
+        DELETE FROM proportion_of_global_types
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoGlobalType">
+        <![CDATA[
+        INSERT INTO proportion_of_global_types (
+            id ,
+            particular_year ,
+            type_name ,
+            type_name_en ,
+            area_proportion ,
+            area ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{typeName,jdbcType=VARCHAR},
+                     #{typeNameEn,jdbcType=VARCHAR},
+                     #{areaProportion,jdbcType=DOUBLE},
+                     #{area,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.OceanTemperatureMapper">
+
+    <resultMap id="RM_Ocean" type="com.ruoyi.system.domain_yada.OceanTemperatureVO">
+
+        <result property="id" column="id"/>
+        <result property="ninoPhenomenon" column="nino_phenomenon"/>
+        <result property="laNina" column="la_nina"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,nino_phenomenon,la_nina,start_date,end_date,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectOcean" resultMap="RM_Ocean">
+        SELECT  <include refid="columns"/>  FROM  sea_surface_temperature_anomaly
+    </select>
+
+    <delete id="DelOcean">
+        DELETE FROM sea_surface_temperature_anomaly
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoOcean">
+        <![CDATA[
+        INSERT INTO sea_surface_temperature_anomaly (
+            id ,
+            nino_phenomenon ,
+            la_nina ,
+            start_date ,
+            end_date ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{ninoPhenomenon,jdbcType=INTEGER},
+                     #{laNina,jdbcType=INTEGER},
+                     #{startDate,jdbcType=DATE},
+                     #{endDate,jdbcType=DATE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.RegionVGIMapper">
+    <resultMap id="RM_RegionVGI" type="com.ruoyi.system.domain_yada.RegionVGIVO">
+
+        <result property="region" column="region"/>
+        <result property="id" column="ID"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="typeName" column="type_name"/>
+        <result property="typeNameEn" column="type_name_en"/>
+        <result property="forest" column="forest"/>
+        <result property="grassland" column="grassland"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,region,region_en,type_name,type_name_en,forest,created_by,created_time,grassland,particular_year
+        ]]>
+	</sql>
+
+    <select id="selectRegion" resultMap="RM_RegionVGI">
+        SELECT  <include refid="columns"/>  FROM  region_vgi;
+    </select>
+
+    <delete id="DelRegion">
+        DELETE FROM region_vgi
+        WHERE ID=#{id}
+    </delete>
+
+
+    <insert id="IntoRegion">
+        <![CDATA[
+        INSERT INTO region_vgi (
+            id,
+            region ,
+            region_en ,
+            type_name ,
+            type_name_en ,
+            forest ,
+            created_by ,
+            created_time,
+            grassland,
+            particular_year
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{region_en,jdbcType=VARCHAR},
+                     #{type_name,jdbcType=VARCHAR},
+                     #{type_name_en,jdbcType=TIMESTAMP},
+                     #{forest,jdbcType=DOUBLE},
+                     #{createdBy,jdbcType=VARCHAR},
+                     #{createdTime,jdbcType=DATE},
+                     #{grassland,jdbcType=DOUBLE},
+                     #{particularYear}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.RegionalSystemMapper">
+
+    <resultMap id="RM_Regional" type="com.ruoyi.system.domain_yada.RegionalSystemVO">
+
+        <result property="id" column="id"/>
+        <result property="region" column="region"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="typeConversion" column="type_conversion"/>
+        <result property="typeconversionEn" column="type_conversion_en"/>
+        <result property="proportionOfChangedAreas" column="proportion_of_changed_areas"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,region,region_en,type_conversion,type_conversion_en,proportion_of_changed_areas,particular_year,createBy,createTime
+        ]]>
+	</sql>
+
+    <select id="selectRegional" resultMap="RM_Regional">
+        SELECT  <include refid="columns"/>  FROM  proportion_of_ecosystem_type_transfer
+    </select>
+
+    <delete id="DelRegional">
+        DELETE FROM proportion_of_ecosystem_type_transfer
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoRegional">
+        <![CDATA[
+        INSERT INTO proportion_of_ecosystem_type_transfer (
+            id ,
+            region ,
+            region_en ,
+            type_conversion ,
+            type_conversion_en ,
+            proportion_of_changed_areas,
+            particular_year,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{typeConversion,jdbcType=VARCHAR},
+                     #{typeconversionEn,jdbcType=VARCHAR},
+                     #{proportionOfChangedAreas,jdbcType=DOUBLE},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="parentId != null and parentId != 0">parent_id,</if>
  			<if test="deptName != null and deptName != ''">dept_name,</if>
  			<if test="ancestors != null and ancestors != ''">ancestors,</if>
- 			<if test="orderNum != null and orderNum != ''">order_num,</if>
+ 			<if test="orderNum != null">order_num,</if>
  			<if test="leader != null and leader != ''">leader,</if>
  			<if test="phone != null and phone != ''">phone,</if>
  			<if test="email != null and email != ''">email,</if>
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="parentId != null and parentId != 0">#{parentId},</if>
  			<if test="deptName != null and deptName != ''">#{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">#{ancestors},</if>
- 			<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+ 			<if test="orderNum != null">#{orderNum},</if>
  			<if test="leader != null and leader != ''">#{leader},</if>
  			<if test="phone != null and phone != ''">#{phone},</if>
  			<if test="email != null and email != ''">#{email},</if>
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
  			<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
  			<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
- 			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+ 			<if test="orderNum != null">order_num = #{orderNum},</if>
  			<if test="leader != null">leader = #{leader},</if>
  			<if test="phone != null">phone = #{phone},</if>
  			<if test="email != null">email = #{email},</if>

ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -130,7 +130,7 @@
 		<set>
 			<if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
 			<if test="parentId != null">parent_id = #{parentId},</if>
-			<if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
+			<if test="orderNum != null">order_num = #{orderNum},</if>
 			<if test="path != null and path != ''">path = #{path},</if>
 			<if test="component != null">component = #{component},</if>
 			<if test="query != null">`query` = #{query},</if>
@@ -153,7 +153,7 @@
 		<if test="menuId != null and menuId != 0">menu_id,</if>
 		<if test="parentId != null and parentId != 0">parent_id,</if>
 		<if test="menuName != null and menuName != ''">menu_name,</if>
-		<if test="orderNum != null and orderNum != ''">order_num,</if>
+		<if test="orderNum != null">order_num,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="component != null and component != ''">component,</if>
 		<if test="query != null and query != ''">`query`,</if>
@@ -171,7 +171,7 @@
 		<if test="menuId != null and menuId != 0">#{menuId},</if>
 		<if test="parentId != null and parentId != 0">#{parentId},</if>
 		<if test="menuName != null and menuName != ''">#{menuName},</if>
-		<if test="orderNum != null and orderNum != ''">#{orderNum},</if>
+		<if test="orderNum != null">#{orderNum},</if>
 		<if test="path != null and path != ''">#{path},</if>
 		<if test="component != null and component != ''">#{component},</if>
 		<if test="query != null and query != ''">#{query},</if>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -4,50 +4,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
-	<resultMap type="SysUser" id="SysUserResult">
+    <resultMap type="SysUser" id="SysUserResult">
-		<id     property="userId"       column="user_id"      />
+        <id     property="userId"       column="user_id"      />
-		<result property="deptId"       column="dept_id"      />
+        <result property="deptId"       column="dept_id"      />
-		<result property="userName"     column="user_name"    />
+        <result property="userName"     column="user_name"    />
-		<result property="nickName"     column="nick_name"    />
+        <result property="nickName"     column="nick_name"    />
-		<result property="email"        column="email"        />
+        <result property="email"        column="email"        />
-		<result property="phonenumber"  column="phonenumber"  />
+        <result property="phonenumber"  column="phonenumber"  />
-		<result property="sex"          column="sex"          />
+        <result property="sex"          column="sex"          />
-		<result property="avatar"       column="avatar"       />
+        <result property="avatar"       column="avatar"       />
-		<result property="password"     column="password"     />
+        <result property="password"     column="password"     />
-		<result property="status"       column="status"       />
+        <result property="status"       column="status"       />
-		<result property="delFlag"      column="del_flag"     />
+        <result property="delFlag"      column="del_flag"     />
-		<result property="loginIp"      column="login_ip"     />
+        <result property="loginIp"      column="login_ip"     />
-		<result property="loginDate"    column="login_date"   />
+        <result property="loginDate"    column="login_date"   />
-		<result property="createBy"     column="create_by"    />
+        <result property="createBy"     column="create_by"    />
-		<result property="createTime"   column="create_time"  />
+        <result property="createTime"   column="create_time"  />
-		<result property="updateBy"     column="update_by"    />
+        <result property="updateBy"     column="update_by"    />
-		<result property="updateTime"   column="update_time"  />
+        <result property="updateTime"   column="update_time"  />
-		<result property="remark"       column="remark"       />
+        <result property="remark"       column="remark"       />
-		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
+        <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
-		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
+        <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
-	</resultMap>
+    </resultMap>
 	
-	<resultMap id="deptResult" type="SysDept">
+    <resultMap id="deptResult" type="SysDept">
-		<id     property="deptId"   column="dept_id"     />
+        <id     property="deptId"    column="dept_id"     />
-		<result property="parentId" column="parent_id"   />
+        <result property="parentId"  column="parent_id"   />
-		<result property="deptName" column="dept_name"   />
+        <result property="deptName"  column="dept_name"   />
-		<result property="orderNum" column="order_num"   />
+        <result property="ancestors" column="ancestors"   />
-		<result property="leader"   column="leader"      />
+        <result property="orderNum"  column="order_num"   />
-		<result property="status"   column="dept_status" />
+        <result property="leader"    column="leader"      />
-	</resultMap>
+        <result property="status"    column="dept_status" />
+    </resultMap>
 	
-	<resultMap id="RoleResult" type="SysRole">
+    <resultMap id="RoleResult" type="SysRole">
-		<id     property="roleId"       column="role_id"        />
+        <id     property="roleId"       column="role_id"        />
-		<result property="roleName"     column="role_name"      />
+        <result property="roleName"     column="role_name"      />
-		<result property="roleKey"      column="role_key"       />
+        <result property="roleKey"      column="role_key"       />
-		<result property="roleSort"     column="role_sort"      />
+        <result property="roleSort"     column="role_sort"      />
-		<result property="dataScope"     column="data_scope"    />
+        <result property="dataScope"     column="data_scope"    />
-		<result property="status"       column="role_status"    />
+        <result property="status"       column="role_status"    />
-	</resultMap>
+    </resultMap>
 	
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
-        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id

ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.ThematicMapMapper">
+    <resultMap id="RM_ThematicMap" type="com.ruoyi.system.domain_yada.ThematicMapDomain">
+        <result property="id" column="id"/>
+        <result property="pictureZh" column="picture_zh"/>
+        <result property="pictureEn" column="picture_en"/>
+        <result property="pictureName" column="picture_name"/>
+        <result property="pictureType" column="picture_type"/>
+        <result property="pictureTime" column="picture_time"/>
+        <result property="picturePath" column="picture_path"/>
+        <result property="pictureTime" column="picture_time"/>
+        <result property="remarks" column="remarks"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,picture_zh,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectAllThematicMap" resultMap="RM_ThematicMap">
+        SELECT  <include refid="columns"/>  FROM thematic_map;
+    </select>
+
+    <delete id="deleteThematicMap">
+        DELETE FROM thematic_map
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="saveThematicMap">
+        <![CDATA[
+        INSERT INTO thematic_map (
+            id ,
+            picture_zh ,
+            picture_en ,
+            picture_name ,
+            picture_type ,
+            picture_time ,
+            picture_path,
+            remarks,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=BIGINT},
+                     #{pictureZh,jdbcType=VARCHAR}},
+                     #{pictureEn,jdbcType=VARCHAR}},
+                     #{pictureName,jdbcType=VARCHAR}},
+                     #{pictureType,jdbcType=VARCHAR}},
+                     #{pictureTime,jdbcType=TIMESTAMP},
+                     #{picturePath,jdbcType=VARCHAR},
+                     #{remarks,jdbcType=VARCHAR},
+                     #{createdBy,jdbcType=VARCHAR},
+                     #{createdTime,jdbcType=TIMESTAMP}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.UrbanMapper">
+
+    <resultMap id="RM_Urban" type="com.ruoyi.system.domain_yada.UrbanVO">
+
+        <result property="id" column="id"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="name" column="name"/>
+        <result property="nameEn" column="name_en"/>
+        <result property="urbanArea" column="urban_area"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,particular_year,name,name_en,urban_area,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectUrban" resultMap="RM_Urban">
+        SELECT  <include refid="columns"/>  FROM  urban_agglomeration_china
+    </select>
+
+    <delete id="DelUrban">
+        DELETE FROM urban_agglomeration_china
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoUrban">
+        <![CDATA[
+        INSERT INTO urban_agglomeration_china (
+            id ,
+            particular_year ,
+            name ,
+            name_en ,
+            urban_area ,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{name,jdbcType=VARCHAR},
+                     #{nameEn,jdbcType=VARCHAR},
+                     #{urbanArea,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper_yada.VegetationCoverageMapper">
+    <resultMap id="RM_Vegetation" type="com.ruoyi.system.domain_yada.VegetationCoverageVO">
+
+        <result property="id" column="id"/>
+        <result property="particularYear" column="particular_year"/>
+        <result property="region" column="region"/>
+        <result property="regionEn" column="region_en"/>
+        <result property="protectedLands" column="protected_lands"/>
+        <result property="nonProtectedLands" column="non_protected_lands"/>
+        <result property="mountain" column="mountain"/>
+        <result property="nonMountain" column="non_mountain"/>
+        <result property="createBy" column="created_by"/>
+        <result property="createTime" column="created_time"/>
+    </resultMap>
+
+    <sql id="columns">
+	    <![CDATA[
+        id,particular_year,region,region_en,protected_lands,non_protected_lands,mountain,non_mountain,created_by,created_time
+        ]]>
+	</sql>
+
+    <select id="selectVegetation" resultMap="RM_Vegetation">
+        SELECT  <include refid="columns"/>  FROM  fvc_npp
+    </select>
+
+    <delete id="DelVegetation">
+        DELETE FROM fvc_npp
+        WHERE ID=#{id}
+    </delete>
+
+    <insert id="IntoVegetation">
+        <![CDATA[
+        INSERT INTO fvc_npp (
+            id ,
+            particular_year ,
+            region ,
+            region_en ,
+            protected_lands ,
+            non_protected_lands ,
+            mountain,
+            non_mountain,
+            created_by ,
+            created_time
+        ) VALUES (
+                     #{id,jdbcType=VARCHAR},
+                     #{particularYear,jdbcType=VARCHAR},
+                     #{region,jdbcType=VARCHAR},
+                     #{regionEn,jdbcType=VARCHAR},
+                     #{protectedLands,jdbcType=DOUBLE},
+                     #{nonProtectedLand,jdbcType=DOUBLE},
+                     #{mountain,jdbcType=DOUBLE},
+                     #{nonMountain,jdbcType=DOUBLE},
+                     #{createBy,jdbcType=VARCHAR},
+                     #{createTime,jdbcType=DATE}
+                 )
+        ]]>
+    </insert>
+
+</mapper> 

ruoyi-ui/package.json

@@ -39,15 +39,15 @@
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
-    "core-js": "3.19.1",
+    "core-js": "^3.19.1",
     "echarts": "4.9.0",
-    "element-ui": "2.15.6",
+    "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
-    "jsencrypt": "3.2.1",
+    "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

ruoyi-ui/src/assets/styles/element-variables.scss

@@ -17,7 +17,7 @@ $--button-font-weight: 400;
 $--border-color-light: #dfe4ed;
 $--border-color-lighter: #e6ebf5;
 
-$--table-border:1px solid#dfe6ec;
+$--table-border: 1px solid #dfe6ec;
 
 /* icon font path, required */
 $--font-path: '~element-ui/lib/theme-chalk/fonts';

ruoyi-ui/src/plugins/tab.js

@@ -55,10 +55,10 @@ export default {
     return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute);
   },
   // 添加tab页签
-  openPage(title, url) {
+  openPage(title, url, params) {
     var obj = { path: url, meta: { title: title } }
     store.dispatch('tagsView/addView', obj);
-    return router.push(url);
+    return router.push({ path: url, query: params });
   },
   // 修改tab页签
   updatePage(obj) {

ruoyi-ui/src/views/monitor/server/index.vue

@@ -106,7 +106,7 @@
             <span>Java虚拟机信息</span>
           </div>
           <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%;">
+            <table cellspacing="0" style="width: 100%;table-layout:fixed;">
               <tbody>
                 <tr>
                   <td class="el-table__cell is-leaf"><div class="cell">Java名称</div></td>

ruoyi-ui/src/views/system/dict/data.vue

@@ -191,7 +191,7 @@
 
 <script>
 import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { listType, getType } from "@/api/system/dict/type";
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
 
 export default {
   name: "Data",
@@ -287,8 +287,8 @@ export default {
     },
     /** 查询字典类型列表 */
     getTypeList() {
-      listType().then(response => {
+      getDictOptionselect().then(response => {
-        this.typeOptions = response.rows;
+        this.typeOptions = response.data;
       });
     },
     /** 查询字典数据列表 */

ruoyi-ui/src/views/system/user/index.vue

@@ -21,6 +21,7 @@
             :filter-node-method="filterNode"
             ref="tree"
             default-expand-all
+            highlight-current
             @node-click="handleNodeClick"
           />
         </div>

ruoyi-ui/src/views/tool/gen/index.vue

@@ -305,7 +305,7 @@ export default {
       return result.value || ' ';
     },
     /** 复制代码成功 */
-    clipboardSuccess(){
+    clipboardSuccess() {
       this.$modal.msgSuccess("复制成功");
     },
     // 多选框选中数据
@@ -318,7 +318,9 @@ export default {
     /** 修改按钮操作 */
     handleEditTable(row) {
       const tableId = row.tableId || this.ids[0];
-      this.$router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: this.queryParams.pageNum } });
+      const tableName = row.tableName || this.tableNames[0];
+      const params = { pageNum: this.queryParams.pageNum };
+      this.$tab.openPage("修改[" + tableName + "]生成配置", '/tool/gen-edit/index/' + tableId, params);
     },
     /** 删除按钮操作 */
     handleDelete(row) {