From 598860d544e2ce515807d0d7c74b6b69206ca346 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Fri, 20 May 2022 11:56:55 +0800 Subject: [PATCH 01/26] 11 --- demo/.gitignore | 33 ++ demo/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 58727 bytes demo/.mvn/wrapper/maven-wrapper.properties | 2 + demo/mvnw | 316 ++++++++++++++++++ demo/mvnw.cmd | 188 +++++++++++ demo/pom.xml | 41 +++ .../com/example/demo/DemoApplication.java | 13 + .../src/main/resources/application.properties | 1 + .../example/demo/DemoApplicationTests.java | 13 + .../RemoteSensing/RegionVGIController.java | 0 .../AdahTestingController.java | 2 +- .../AtmosphereController.java | 2 +- .../AustraliaMiddleEastController.java | 12 +- .../ENSOController.java | 2 +- .../ForestController.java | 2 +- .../GlobalEcologyController.java | 2 +- .../controller/yada/RegionVGIController.java | 72 ++++ .../SpecialReportController.java | 2 +- .../UrbanController.java | 2 +- .../AustraliaMiddleEastVO.java | 4 +- .../{vo => domainyada}/RegionVGIVO.java | 2 +- .../AdahTestingMapper.java | 2 +- .../AtmosphereMapper.java | 2 +- .../AustraliaMiddleEastMapper.java | 4 +- .../{mapper => mapperyada}/ENSOMapper.java | 2 +- .../{mapper => mapperyada}/ForestMapper.java | 2 +- .../GlobalEcologyMapper.java | 2 +- .../RegionVGIMapper.java | 5 +- .../{mapper => mapperyada}/UrbanMapper.java | 2 +- .../IAdahTestingService.java | 2 +- .../IAtmosphereService.java | 2 +- .../IAustraliaMiddleEastService.java | 4 +- .../IENSOService.java | 2 +- .../IForestService.java | 2 +- .../IGlobalEcologyService.java | 2 +- .../IRegionVGIService.java | 19 +- .../ISpecialReportService.java | 2 +- .../IUrbanService.java | 2 +- .../impl/AdahTestingServiceimpl.java | 4 +- .../impl/AtmosphereServiceimpl.java | 4 +- .../impl/AustraliaMiddleEastServiceimpl.java | 9 +- .../impl/ENSOServiceimpl.java | 4 +- .../impl/ForestServiceimpl.java | 4 +- .../impl/GlobalEcologyServiceimpl.java | 4 +- .../impl/RegionVGIServiceimpl.java | 9 +- .../impl/SpecialReportServiceimpl.java | 4 +- .../impl/UrbanServiceimpl.java | 4 +- .../mapper/system/AdahTestingMapper.xml | 2 +- .../mapper/system/AtmosphereMapper.xml | 2 +- .../system/AustraliaMiddleEastMapper.xml | 4 +- .../resources/mapper/system/ENSOMapper.xml | 2 +- .../resources/mapper/system/ForestMapper.xml | 2 +- .../mapper/system/GlobalEcologyMapper.xml | 2 +- .../mapper/system/RegionVGIMapper.xml | 4 +- .../resources/mapper/system/UrbanMapper.xml | 2 +- 55 files changed, 759 insertions(+), 76 deletions(-) create mode 100644 demo/.gitignore create mode 100644 demo/.mvn/wrapper/maven-wrapper.jar create mode 100644 demo/.mvn/wrapper/maven-wrapper.properties create mode 100644 demo/mvnw create mode 100644 demo/mvnw.cmd create mode 100644 demo/pom.xml create mode 100644 demo/src/main/java/com/example/demo/DemoApplication.java create mode 100644 demo/src/main/resources/application.properties create mode 100644 demo/src/test/java/com/example/demo/DemoApplicationTests.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/RegionVGIController.java rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{RemoteSensing => yada}/AdahTestingController.java (71%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{RemoteSensing => yada}/AtmosphereController.java (71%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{RemoteSensing => yada}/AustraliaMiddleEastController.java (83%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{RemoteSensing => yada}/ENSOController.java (70%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{RemoteSensing => yada}/ForestController.java (69%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{RemoteSensing => yada}/GlobalEcologyController.java (86%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{RemoteSensing => yada}/SpecialReportController.java (71%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/{RemoteSensing => yada}/UrbanController.java (69%) rename ruoyi-system/src/main/java/com/ruoyi/system/{vo => domainyada}/AustraliaMiddleEastVO.java (95%) rename ruoyi-system/src/main/java/com/ruoyi/system/{vo => domainyada}/RegionVGIVO.java (98%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper => mapperyada}/AdahTestingMapper.java (72%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper => mapperyada}/AtmosphereMapper.java (72%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper => mapperyada}/AustraliaMiddleEastMapper.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper => mapperyada}/ENSOMapper.java (71%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper => mapperyada}/ForestMapper.java (71%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper => mapperyada}/GlobalEcologyMapper.java (73%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper => mapperyada}/RegionVGIMapper.java (71%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper => mapperyada}/UrbanMapper.java (71%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/IAdahTestingService.java (76%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/IAtmosphereService.java (76%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/IAustraliaMiddleEastService.java (80%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/IENSOService.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/IForestService.java (74%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/IGlobalEcologyService.java (77%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/IRegionVGIService.java (55%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/ISpecialReportService.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/IUrbanService.java (74%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/AdahTestingServiceimpl.java (60%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/AtmosphereServiceimpl.java (60%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/AustraliaMiddleEastServiceimpl.java (74%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/ENSOServiceimpl.java (59%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/ForestServiceimpl.java (59%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/GlobalEcologyServiceimpl.java (61%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/RegionVGIServiceimpl.java (72%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/SpecialReportServiceimpl.java (60%) rename ruoyi-system/src/main/java/com/ruoyi/system/{service => serviceyada}/impl/UrbanServiceimpl.java (59%) diff --git a/demo/.gitignore b/demo/.gitignore new file mode 100644 index 000000000..549e00a2a --- /dev/null +++ b/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/ diff --git a/demo/.mvn/wrapper/maven-wrapper.jar b/demo/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..c1dd12f17644411d6e840bd5a10c6ecda0175f18 GIT binary patch literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| literal 0 HcmV?d00001 diff --git a/demo/.mvn/wrapper/maven-wrapper.properties b/demo/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..b7cb93e70 --- /dev/null +++ b/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 diff --git a/demo/mvnw b/demo/mvnw new file mode 100644 index 000000000..8a8fb2282 --- /dev/null +++ b/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 "$@" diff --git a/demo/mvnw.cmd b/demo/mvnw.cmd new file mode 100644 index 000000000..1d8ab018e --- /dev/null +++ b/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% diff --git a/demo/pom.xml b/demo/pom.xml new file mode 100644 index 000000000..ddb8c5bd9 --- /dev/null +++ b/demo/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.0 + + + com.example + demo + 0.0.1-SNAPSHOT + demo + Demo project for Spring Boot + + 11 + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 000000000..64b538a17 --- /dev/null +++ b/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); + } + +} diff --git a/demo/src/main/resources/application.properties b/demo/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/demo/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/demo/src/test/java/com/example/demo/DemoApplicationTests.java b/demo/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 000000000..2778a6a7e --- /dev/null +++ b/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() { + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/RegionVGIController.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AdahTestingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AdahTestingController.java similarity index 71% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AdahTestingController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AdahTestingController.java index dd2902ba6..f0c0b32cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AdahTestingController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AdahTestingController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.RemoteSensing; +package com.ruoyi.web.controller.yada; /** * 亚大综合监测 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AtmosphereController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AtmosphereController.java similarity index 71% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AtmosphereController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AtmosphereController.java index dd864858e..60f468564 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AtmosphereController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AtmosphereController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.RemoteSensing; +package com.ruoyi.web.controller.yada; /** * 大气质量监测 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AustraliaMiddleEastController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index 9040013ea..4ec59d8d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -1,17 +1,13 @@ -package com.ruoyi.web.controller.RemoteSensing; +package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.service.IAustraliaMiddleEastService; -import com.ruoyi.system.service.IForestService; -import com.ruoyi.system.vo.AustraliaMiddleEastVO; +import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; 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; @@ -25,7 +21,7 @@ import java.util.List; @RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8") public class AustraliaMiddleEastController { - // @Autowired + //@Autowired private IAustraliaMiddleEastService australiaMiddleEastService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ENSOController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ENSOController.java similarity index 70% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ENSOController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ENSOController.java index d79abbb3b..560ce93ce 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ENSOController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ENSOController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.RemoteSensing; +package com.ruoyi.web.controller.yada; /** * ENSO影响监测 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ForestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestController.java similarity index 69% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ForestController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestController.java index 43ba9c619..d58bda9ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/ForestController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.RemoteSensing; +package com.ruoyi.web.controller.yada; /** * 森林监测 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/GlobalEcologyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalEcologyController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/GlobalEcologyController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalEcologyController.java index 73895658f..93dea68bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/GlobalEcologyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalEcologyController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.RemoteSensing; +package com.ruoyi.web.controller.yada; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java new file mode 100644 index 000000000..0f1e81cb3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java @@ -0,0 +1,72 @@ +package com.ruoyi.web.controller.yada; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.serviceyada.IRegionVGIService; +import com.ruoyi.system.domainyada.RegionVGIVO; +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.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 +{ + //@Autowired + private IRegionVGIService regionVGIService; + /** + * 查询方法 + * @param response + * @param request + * @return + */ + @RequestMapping(value = "/SelectRegion",method = {RequestMethod.POST}) + public AjaxResult SelectRegion(HttpServletResponse response, HttpServletRequest request) + { + List 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(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/SpecialReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java similarity index 71% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/SpecialReportController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java index b019a94d9..7953a60b2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/SpecialReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.RemoteSensing; +package com.ruoyi.web.controller.yada; /** * 专题报告 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java similarity index 69% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/UrbanController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index 27fbf3353..fa6b510ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/RemoteSensing/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.RemoteSensing; +package com.ruoyi.web.controller.yada; /** * 城市监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/AustraliaMiddleEastVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AustraliaMiddleEastVO.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/vo/AustraliaMiddleEastVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AustraliaMiddleEastVO.java index 20c863231..735bf4a95 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/AustraliaMiddleEastVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AustraliaMiddleEastVO.java @@ -1,7 +1,5 @@ -package com.ruoyi.system.vo; +package com.ruoyi.system.domainyada; -import javax.xml.crypto.Data; -import java.lang.ref.PhantomReference; import java.time.LocalDate; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/RegionVGIVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionVGIVO.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/vo/RegionVGIVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionVGIVO.java index 379df3396..6e17ed2a5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/RegionVGIVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionVGIVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.vo; +package com.ruoyi.system.domainyada; import java.io.Serializable; import java.time.LocalDate; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdahTestingMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AdahTestingMapper.java similarity index 72% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdahTestingMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AdahTestingMapper.java index bf493c8e8..041af15e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdahTestingMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AdahTestingMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.system.mapperyada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AtmosphereMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AtmosphereMapper.java similarity index 72% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/AtmosphereMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AtmosphereMapper.java index 65c0d27c0..cc3f6c2a5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AtmosphereMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AtmosphereMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.system.mapperyada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AustraliaMiddleEastMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AustraliaMiddleEastMapper.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/AustraliaMiddleEastMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AustraliaMiddleEastMapper.java index 9293c5b94..1725f2efd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AustraliaMiddleEastMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AustraliaMiddleEastMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.system.mapperyada; -import com.ruoyi.system.vo.AustraliaMiddleEastVO; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ENSOMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ENSOMapper.java similarity index 71% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/ENSOMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ENSOMapper.java index d5bed2f89..9805fa16e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ENSOMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ENSOMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.system.mapperyada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ForestMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ForestMapper.java similarity index 71% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/ForestMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ForestMapper.java index 0942f03a0..60bba19e0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ForestMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ForestMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.system.mapperyada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalEcologyMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalEcologyMapper.java similarity index 73% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalEcologyMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalEcologyMapper.java index 2cbfa8766..8bfc2bca6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalEcologyMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalEcologyMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.system.mapperyada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegionVGIMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionVGIMapper.java similarity index 71% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegionVGIMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionVGIMapper.java index c44334dcb..e339fd37b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RegionVGIMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionVGIMapper.java @@ -1,7 +1,6 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.system.mapperyada; -import com.ruoyi.system.vo.AustraliaMiddleEastVO; -import com.ruoyi.system.vo.RegionVGIVO; +import com.ruoyi.system.domainyada.RegionVGIVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UrbanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/UrbanMapper.java similarity index 71% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/UrbanMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/UrbanMapper.java index 05cac67fc..e6840960a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UrbanMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/UrbanMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.system.mapperyada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAdahTestingService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAdahTestingService.java similarity index 76% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IAdahTestingService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAdahTestingService.java index 507b367bf..9190c72b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAdahTestingService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAdahTestingService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; /** * 亚大综合监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAtmosphereService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAtmosphereService.java similarity index 76% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IAtmosphereService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAtmosphereService.java index d91916e4a..f3db831d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAtmosphereService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAtmosphereService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; /** * 大气质量监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAustraliaMiddleEastService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAustraliaMiddleEastService.java similarity index 80% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IAustraliaMiddleEastService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAustraliaMiddleEastService.java index 01f552567..7f0e9fa5e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IAustraliaMiddleEastService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAustraliaMiddleEastService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; -import com.ruoyi.system.vo.AustraliaMiddleEastVO; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IENSOService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IENSOService.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IENSOService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IENSOService.java index c062f4dfa..1f59b0dac 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IENSOService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IENSOService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; /** * ENSO影响监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IForestService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IForestService.java similarity index 74% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IForestService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IForestService.java index d763f2898..214f23a86 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IForestService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IForestService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; /** * 森林监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalEcologyService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalEcologyService.java similarity index 77% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalEcologyService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalEcologyService.java index 007914e19..8d12989b5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalEcologyService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalEcologyService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; /** * 全球生态环境监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRegionVGIService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionVGIService.java similarity index 55% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IRegionVGIService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionVGIService.java index 1cf8d34d7..7ceb2dfb1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IRegionVGIService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionVGIService.java @@ -1,7 +1,6 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; -import com.ruoyi.system.vo.AustraliaMiddleEastVO; -import com.ruoyi.system.vo.RegionVGIVO; +import com.ruoyi.system.domainyada.RegionVGIVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,9 +11,23 @@ import java.util.List; */ public interface IRegionVGIService { + /** + * 查询 + * @return + */ public List selectRegion(); + /** + * 删除 + * @param id + * @return + */ public Integer DelRegion(@Param("id") String id); + /** + * 添加 + * @param eastVO + * @return + */ public Integer IntoRegion(RegionVGIVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISpecialReportService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/ISpecialReportService.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISpecialReportService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/ISpecialReportService.java index 7c098d7ca..cf8a3ddc6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISpecialReportService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/ISpecialReportService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; /** * 专题报告 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUrbanService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IUrbanService.java similarity index 74% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IUrbanService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IUrbanService.java index c9d7c75bd..87d2ee389 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUrbanService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IUrbanService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service; +package com.ruoyi.system.serviceyada; /** * 城市监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdahTestingServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AdahTestingServiceimpl.java similarity index 60% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdahTestingServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AdahTestingServiceimpl.java index 68c0c741d..faf98c3e1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdahTestingServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AdahTestingServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.service.IAdahTestingService; +import com.ruoyi.system.serviceyada.IAdahTestingService; /** * 亚大综合监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AtmosphereServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AtmosphereServiceimpl.java similarity index 60% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AtmosphereServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AtmosphereServiceimpl.java index 99ccb59f1..c5a8637c8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AtmosphereServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AtmosphereServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.service.IAtmosphereService; +import com.ruoyi.system.serviceyada.IAtmosphereService; /** * 大气质量监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AustraliaMiddleEastServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AustraliaMiddleEastServiceimpl.java similarity index 74% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AustraliaMiddleEastServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AustraliaMiddleEastServiceimpl.java index 3fa866dd6..08f5bdbdc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AustraliaMiddleEastServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AustraliaMiddleEastServiceimpl.java @@ -1,9 +1,8 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.mapper.AustraliaMiddleEastMapper; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.IAustraliaMiddleEastService; -import com.ruoyi.system.vo.AustraliaMiddleEastVO; +import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; +import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ENSOServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ENSOServiceimpl.java similarity index 59% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ENSOServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ENSOServiceimpl.java index 490815b49..f6f06e26c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ENSOServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ENSOServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.service.IENSOService; +import com.ruoyi.system.serviceyada.IENSOService; /** * ENSO影响监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ForestServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ForestServiceimpl.java similarity index 59% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ForestServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ForestServiceimpl.java index cd3b6e1e4..1bcddc14d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ForestServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ForestServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.service.IForestService; +import com.ruoyi.system.serviceyada.IForestService; /** * 森林监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalEcologyServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalEcologyServiceimpl.java similarity index 61% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalEcologyServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalEcologyServiceimpl.java index 104ee944c..0dc272c6a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalEcologyServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalEcologyServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.service.IGlobalEcologyService; +import com.ruoyi.system.serviceyada.IGlobalEcologyService; /** * 全球生态环境监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegionVGIServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionVGIServiceimpl.java similarity index 72% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegionVGIServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionVGIServiceimpl.java index 60966b5dc..c43c34507 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RegionVGIServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionVGIServiceimpl.java @@ -1,9 +1,8 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.mapper.AustraliaMiddleEastMapper; -import com.ruoyi.system.mapper.RegionVGIMapper; -import com.ruoyi.system.service.IRegionVGIService; -import com.ruoyi.system.vo.RegionVGIVO; +import com.ruoyi.system.mapperyada.RegionVGIMapper; +import com.ruoyi.system.serviceyada.IRegionVGIService; +import com.ruoyi.system.domainyada.RegionVGIVO; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SpecialReportServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java similarity index 60% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SpecialReportServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java index 7c2959511..40addc703 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SpecialReportServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.service.ISpecialReportService; +import com.ruoyi.system.serviceyada.ISpecialReportService; /** * 专题报告 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UrbanServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/UrbanServiceimpl.java similarity index 59% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UrbanServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/UrbanServiceimpl.java index 02417b848..5a27f5bd5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UrbanServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/UrbanServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.service.IUrbanService; +import com.ruoyi.system.serviceyada.IUrbanService; /** * * 城市监测 diff --git a/ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml index 7bec5b4e5..d3d0b771e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml index 708cc972f..1a029366d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index b0de66317..f0f216d0c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml index b457a2528..dbf1c541c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml index 665c6a13e..6918f0a28 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml index 51d7e8555..8126b1b1d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml index b1eb0efe3..1b062c0bc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml index 7756d3cf9..1d12cf809 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file From 43e3d8cfeab8b3cf7daeefc2e73304baa5cffa31 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Fri, 20 May 2022 14:19:25 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hTestingController.java => AorestCoverageController.java} | 2 +- ...lobalEcologyController.java => GlobalTypeController.java} | 0 ...ForestController.java => OceanTemperatureController.java} | 0 .../{ENSOController.java => RegionalSystemController.java} | 0 ...hereController.java => VegetationCoverageController.java} | 2 +- .../java/com/ruoyi/system/domainyada/AorestCoverageVO.java | 5 +++++ .../main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java | 5 +++++ .../java/com/ruoyi/system/domainyada/OceanTemperatureVO.java | 5 +++++ .../java/com/ruoyi/system/domainyada/RegionalSystemVO.java | 5 +++++ .../com/ruoyi/system/domainyada/VegetationCoverageVO.java | 5 +++++ .../{AdahTestingMapper.java => AorestCoverageMapper.java} | 0 .../{GlobalEcologyMapper.java => GlobalTypeMapper.java} | 0 .../{ForestMapper.java => OceanTemperatureMapper.java} | 0 .../{ENSOMapper.java => RegionalSystemMapper.java} | 0 .../{AtmosphereMapper.java => VegetationCoverageMapper.java} | 0 ...{IAdahTestingService.java => IAorestCoverageService.java} | 0 .../{IGlobalEcologyService.java => IGlobalTypeService.java} | 0 .../{IForestService.java => IOceanTemperatureService.java} | 0 .../{IENSOService.java => IRegionalSystemService.java} | 0 ...tmosphereService.java => IVegetationCoverageService.java} | 0 ...estingServiceimpl.java => AorestCoverageServiceimpl.java} | 0 ...balEcologyServiceimpl.java => GlobalTypeServiceimpl.java} | 0 ...restServiceimpl.java => OceanTemperatureServiceimpl.java} | 0 .../{ENSOServiceimpl.java => RegionalSystemServiceimpl.java} | 0 ...reServiceimpl.java => VegetationCoverageServiceimpl.java} | 0 .../{AdahTestingMapper.xml => AorestCoverageMapper.xml} | 0 .../system/{GlobalEcologyMapper.xml => GlobalTypeMapper.xml} | 0 .../system/{ForestMapper.xml => OceanTemperatureMapper.xml} | 0 .../system/{ENSOMapper.xml => RegionalSystemMapper.xml} | 0 .../{AtmosphereMapper.xml => VegetationCoverageMapper.xml} | 0 30 files changed, 27 insertions(+), 2 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/{AdahTestingController.java => AorestCoverageController.java} (85%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/{GlobalEcologyController.java => GlobalTypeController.java} (100%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/{ForestController.java => OceanTemperatureController.java} (100%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/{ENSOController.java => RegionalSystemController.java} (100%) rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/{AtmosphereController.java => VegetationCoverageController.java} (73%) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java rename ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/{AdahTestingMapper.java => AorestCoverageMapper.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/{GlobalEcologyMapper.java => GlobalTypeMapper.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/{ForestMapper.java => OceanTemperatureMapper.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/{ENSOMapper.java => RegionalSystemMapper.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/{AtmosphereMapper.java => VegetationCoverageMapper.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/{IAdahTestingService.java => IAorestCoverageService.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/{IGlobalEcologyService.java => IGlobalTypeService.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/{IForestService.java => IOceanTemperatureService.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/{IENSOService.java => IRegionalSystemService.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/{IAtmosphereService.java => IVegetationCoverageService.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/{AdahTestingServiceimpl.java => AorestCoverageServiceimpl.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/{GlobalEcologyServiceimpl.java => GlobalTypeServiceimpl.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/{ForestServiceimpl.java => OceanTemperatureServiceimpl.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/{ENSOServiceimpl.java => RegionalSystemServiceimpl.java} (100%) rename ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/{AtmosphereServiceimpl.java => VegetationCoverageServiceimpl.java} (100%) rename ruoyi-system/src/main/resources/mapper/system/{AdahTestingMapper.xml => AorestCoverageMapper.xml} (100%) rename ruoyi-system/src/main/resources/mapper/system/{GlobalEcologyMapper.xml => GlobalTypeMapper.xml} (100%) rename ruoyi-system/src/main/resources/mapper/system/{ForestMapper.xml => OceanTemperatureMapper.xml} (100%) rename ruoyi-system/src/main/resources/mapper/system/{ENSOMapper.xml => RegionalSystemMapper.xml} (100%) rename ruoyi-system/src/main/resources/mapper/system/{AtmosphereMapper.xml => VegetationCoverageMapper.xml} (100%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AdahTestingController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AdahTestingController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index f0c0b32cf..af825429d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AdahTestingController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -1,7 +1,7 @@ package com.ruoyi.web.controller.yada; /** - * 亚大综合监测 + * 森林覆盖率 * @Author: JinSheng Song * @Date: 2022/5/11 9:08 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalEcologyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalEcologyController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ENSOController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ENSOController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AtmosphereController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java similarity index 73% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AtmosphereController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index 60f468564..8afabe23c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AtmosphereController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -5,5 +5,5 @@ package com.ruoyi.web.controller.yada; * @Author: JinSheng Song * @Date: 2022/5/11 10:56 */ -public class AtmosphereController { +public class VegetationCoverageController { } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java new file mode 100644 index 000000000..f8e1dd4cb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java @@ -0,0 +1,5 @@ +package com.ruoyi.system.domainyada;/** + * @Author: JinSheng Song + * @Date: 2022/5/20 14:06 + */public class AorestCoverageVo { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java new file mode 100644 index 000000000..c77caad93 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java @@ -0,0 +1,5 @@ +package com.ruoyi.system.domainyada;/** + * @Author: JinSheng Song + * @Date: 2022/5/20 14:07 + */public class GlobalTypeVO { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java new file mode 100644 index 000000000..a26ad320c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java @@ -0,0 +1,5 @@ +package com.ruoyi.system.domainyada;/** + * @Author: JinSheng Song + * @Date: 2022/5/20 14:08 + */public class OceanTemperatureVO { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java new file mode 100644 index 000000000..041ef677c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java @@ -0,0 +1,5 @@ +package com.ruoyi.system.domainyada;/** + * @Author: JinSheng Song + * @Date: 2022/5/20 14:09 + */public class RegionalSystemVO { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java new file mode 100644 index 000000000..51687d0c5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java @@ -0,0 +1,5 @@ +package com.ruoyi.system.domainyada;/** + * @Author: JinSheng Song + * @Date: 2022/5/20 14:09 + */public class VegetationCoverageVO { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AdahTestingMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AdahTestingMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalEcologyMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalEcologyMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ForestMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ForestMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ENSOMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/ENSOMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AtmosphereMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AtmosphereMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAdahTestingService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAdahTestingService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalEcologyService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalEcologyService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IForestService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IForestService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IENSOService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IENSOService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAtmosphereService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAtmosphereService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AdahTestingServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AdahTestingServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalEcologyServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalEcologyServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ForestServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ForestServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ENSOServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/ENSOServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AtmosphereServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AtmosphereServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java diff --git a/ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml rename to ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml rename to ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml rename to ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml rename to ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml rename to ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml From 57db36e0154f52077310c8b1e07a936859f320ee Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Fri, 20 May 2022 14:19:34 +0800 Subject: [PATCH 03/26] no message --- .../yada/AorestCoverageController.java | 64 +++++++++++++++++- .../yada/AustraliaMiddleEastController.java | 2 +- .../controller/yada/GlobalTypeController.java | 61 ++++++++++++++++- .../yada/OceanTemperatureController.java | 66 ++++++++++++++++++- .../yada/RegionalSystemController.java | 66 ++++++++++++++++++- .../web/controller/yada/UrbanController.java | 64 +++++++++++++++++- .../yada/VegetationCoverageController.java | 64 +++++++++++++++++- .../system/domainyada/AorestCoverageVO.java | 25 ++++++- .../ruoyi/system/domainyada/GlobalTypeVO.java | 8 ++- .../system/domainyada/OceanTemperatureVO.java | 8 ++- .../system/domainyada/RegionalSystemVO.java | 9 ++- .../domainyada/VegetationCoverageVO.java | 8 ++- .../mapperyada/AorestCoverageMapper.java | 13 +++- .../system/mapperyada/GlobalTypeMapper.java | 13 +++- .../mapperyada/OceanTemperatureMapper.java | 13 +++- .../mapperyada/RegionalSystemMapper.java | 13 +++- .../mapperyada/VegetationCoverageMapper.java | 13 +++- .../serviceyada/IAorestCoverageService.java | 15 ++++- .../serviceyada/IGlobalTypeService.java | 15 ++++- .../serviceyada/IOceanTemperatureService.java | 15 ++++- .../serviceyada/IRegionalSystemService.java | 15 ++++- .../IVegetationCoverageService.java | 15 ++++- .../impl/AorestCoverageServiceimpl.java | 30 ++++++++- .../impl/GlobalTypeServiceimpl.java | 31 ++++++++- .../impl/OceanTemperatureServiceimpl.java | 29 +++++++- .../impl/RegionalSystemServiceimpl.java | 31 ++++++++- .../impl/SpecialReportServiceimpl.java | 1 + .../impl/VegetationCoverageServiceimpl.java | 32 ++++++++- .../mapper/system/AorestCoverageMapper.xml | 2 +- .../mapper/system/GlobalTypeMapper.xml | 2 +- .../mapper/system/OceanTemperatureMapper.xml | 2 +- .../mapper/system/RegionalSystemMapper.xml | 2 +- .../system/VegetationCoverageMapper.xml | 2 +- 33 files changed, 695 insertions(+), 54 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index af825429d..53ec82ed7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -1,9 +1,71 @@ package com.ruoyi.web.controller.yada; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +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.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** * 森林覆盖率 * @Author: JinSheng Song * @Date: 2022/5/11 9:08 */ -public class AdahTestingController { +@RestController +@RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8") +public class AorestCoverageController { + //@Autowired + private IAustraliaMiddleEastService australiaMiddleEastService; + + /** + * 查询方法 + * @param response + * @param request + * @return + */ + @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) + public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + { + List 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(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index 4ec59d8d1..17761b99b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -18,7 +18,7 @@ import java.util.List; * @Date: 2022/5/11 9:08 */ @RestController -@RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8") +@RequestMapping(value = "/business-service/api/Australia", produces = "application/json;charset=UTF-8") public class AustraliaMiddleEastController { //@Autowired diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java index 93dea68bf..18fd74092 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java @@ -1,15 +1,72 @@ package com.ruoyi.web.controller.yada; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +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.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 GlobalEcologyController { +public class GlobalTypeController { + //@Autowired + private IAustraliaMiddleEastService australiaMiddleEastService; + + /** + * 查询方法 + * @param response + * @param request + * @return + */ + @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) + public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + { + List 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(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java index d58bda9ab..645e6179b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java @@ -1,9 +1,71 @@ package com.ruoyi.web.controller.yada; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +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.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** - * 森林监测 + * 海洋表面温度监测 * @Author: JinSheng Song * @Date: 2022/5/11 9:13 */ -public class ForestController { +@RestController +@RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8") +public class OceanTemperatureController { + //@Autowired + private IAustraliaMiddleEastService australiaMiddleEastService; + + /** + * 查询方法 + * @param response + * @param request + * @return + */ + @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) + public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + { + List 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(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java index 560ce93ce..68aca4bdc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java @@ -1,9 +1,71 @@ package com.ruoyi.web.controller.yada; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +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.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** - * ENSO影响监测 + * 区域生态系统 * @Author: JinSheng Song * @Date: 2022/5/11 9:12 */ -public class ENSOController { +@RestController +@RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8") +public class RegionalSystemController { + //@Autowired + private IAustraliaMiddleEastService australiaMiddleEastService; + + /** + * 查询方法 + * @param response + * @param request + * @return + */ + @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) + public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + { + List 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(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index fa6b510ff..734e03acb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -1,9 +1,71 @@ package com.ruoyi.web.controller.yada; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +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.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 { + //@Autowired + private IAustraliaMiddleEastService australiaMiddleEastService; + + /** + * 查询方法 + * @param response + * @param request + * @return + */ + @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) + public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + { + List 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(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index 8afabe23c..a66eea635 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -1,9 +1,71 @@ package com.ruoyi.web.controller.yada; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +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.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 { + //@Autowired + private IAustraliaMiddleEastService australiaMiddleEastService; + + /** + * 查询方法 + * @param response + * @param request + * @return + */ + @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) + public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + { + List 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(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java index f8e1dd4cb..83b23e077 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java @@ -1,5 +1,26 @@ -package com.ruoyi.system.domainyada;/** +package com.ruoyi.system.domainyada; + +/** + * 森林覆盖率 * @Author: JinSheng Song * @Date: 2022/5/20 14:06 - */public class AorestCoverageVo { + */ +public class AorestCoverageVO { + + private String id; + + private String particularYear; + + private String region; + + private String regionEn; + + private String protectedLands; + + private String nonProtectedLands; + + private String mountain; + + private String nonMountain; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java index c77caad93..f80dd6efa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java @@ -1,5 +1,9 @@ -package com.ruoyi.system.domainyada;/** +package com.ruoyi.system.domainyada; + +/** + * 全球各类型占比 * @Author: JinSheng Song * @Date: 2022/5/20 14:07 - */public class GlobalTypeVO { + */ +public class GlobalTypeVO { } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java index a26ad320c..f544b37a7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java @@ -1,5 +1,9 @@ -package com.ruoyi.system.domainyada;/** +package com.ruoyi.system.domainyada; + +/**+ + * 海面温度监测 * @Author: JinSheng Song * @Date: 2022/5/20 14:08 - */public class OceanTemperatureVO { + */ +public class OceanTemperatureVO { } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java index 041ef677c..8e5a71084 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java @@ -1,5 +1,10 @@ -package com.ruoyi.system.domainyada;/** +package com.ruoyi.system.domainyada; + +/** + * 区域生态系统 * @Author: JinSheng Song * @Date: 2022/5/20 14:09 - */public class RegionalSystemVO { + */ + +public class RegionalSystemVO { } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java index 51687d0c5..fe24bd80b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java @@ -1,5 +1,9 @@ -package com.ruoyi.system.domainyada;/** +package com.ruoyi.system.domainyada; + +/** + * 平均植被覆盖度和净初级生产力 * @Author: JinSheng Song * @Date: 2022/5/20 14:09 - */public class VegetationCoverageVO { + */ +public class VegetationCoverageVO { } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java index 041af15e3..40d584ab1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java @@ -1,8 +1,19 @@ package com.ruoyi.system.mapperyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * @Author: JinSheng Song * @Date: 2022/5/11 15:17 */ -public interface AdahTestingMapper { +public interface AorestCoverageMapper { + +// List selectAustralia(); +// +// Integer DelAustralia(@Param("id") String id); +// +// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java index 8bfc2bca6..4bddaa24b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java @@ -1,8 +1,19 @@ package com.ruoyi.system.mapperyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * @Author: JinSheng Song * @Date: 2022/5/11 15:18 */ -public interface GlobalEcologyMapper { +public interface GlobalTypeMapper { + +// List selectAustralia(); +// +// Integer DelAustralia(@Param("id") String id); +// +// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java index 60bba19e0..e8c3c51c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java @@ -1,8 +1,19 @@ package com.ruoyi.system.mapperyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * @Author: JinSheng Song * @Date: 2022/5/11 15:18 */ -public interface ForestMapper { +public interface OceanTemperatureMapper { + +// List selectAustralia(); +// +// Integer DelAustralia(@Param("id") String id); +// +// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java index 9805fa16e..55b39ac71 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java @@ -1,8 +1,19 @@ package com.ruoyi.system.mapperyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * @Author: JinSheng Song * @Date: 2022/5/11 15:18 */ -public interface ENSOMapper { +public interface RegionalSystemMapper { + +// List selectAustralia(); +// +// Integer DelAustralia(@Param("id") String id); +// +// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java index cc3f6c2a5..d06a59332 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java @@ -1,8 +1,19 @@ package com.ruoyi.system.mapperyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * @Author: JinSheng Song * @Date: 2022/5/11 15:17 */ -public interface AtmosphereMapper { +public interface VegetationCoverageMapper { + +// List selectAustralia(); +// +// Integer DelAustralia(@Param("id") String id); +// +// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java index 9190c72b1..1921e4d16 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java @@ -1,9 +1,20 @@ package com.ruoyi.system.serviceyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** - * 亚大综合监测 + * 森林覆盖率 * @Author: JinSheng Song * @Date: 2022/5/11 11:32 */ -public interface IAdahTestingService { +public interface IAorestCoverageService { + + public List selectAustralia(); + + public Integer DelAustralia(@Param("id") String id); + + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java index 8d12989b5..01940f7b4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java @@ -1,9 +1,20 @@ package com.ruoyi.system.serviceyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** - * 全球生态环境监测 + * 全球各类型占比 * @Author: JinSheng Song * @Date: 2022/5/11 11:37 */ -public interface IGlobalEcologyService { +public interface IGlobalTypeService { + + public List selectAustralia(); + + public Integer DelAustralia(@Param("id") String id); + + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java index 214f23a86..c8240d3d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java @@ -1,9 +1,20 @@ package com.ruoyi.system.serviceyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** - * 森林监测 + * 海面表面温度监测 * @Author: JinSheng Song * @Date: 2022/5/11 11:38 */ -public interface IForestService { +public interface IOceanTemperatureService { + + public List selectAustralia(); + + public Integer DelAustralia(@Param("id") String id); + + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java index 1f59b0dac..ee8fd34bd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java @@ -1,9 +1,20 @@ package com.ruoyi.system.serviceyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** - * ENSO影响监测 + * 区域生态系统 * @Author: JinSheng Song * @Date: 2022/5/11 11:35 */ -public interface IENSOService { +public interface IRegionalSystemService { + + public List selectAustralia(); + + public Integer DelAustralia(@Param("id") String id); + + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java index f3db831d5..735ef2b19 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java @@ -1,9 +1,20 @@ package com.ruoyi.system.serviceyada; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** - * 大气质量监测 + * 平均植被覆盖度和净初级生产力 * @Author: JinSheng Song * @Date: 2022/5/11 11:34 */ -public interface IAtmosphereService { +public interface IVegetationCoverageService { + + public List selectAustralia(); + + public Integer DelAustralia(@Param("id") String id); + + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java index faf98c3e1..43fda2ee2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java @@ -1,11 +1,35 @@ package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.serviceyada.IAdahTestingService; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; +import com.ruoyi.system.serviceyada.IAorestCoverageService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; /** - * 亚大综合监测 + * 森林覆盖率 * @Author: JinSheng Song * @Date: 2022/5/11 11:43 */ -public class AdahTestingServiceimpl implements IAdahTestingService { +public class AorestCoverageServiceimpl implements IAorestCoverageService { + @Autowired + private AustraliaMiddleEastMapper australiaMiddleEastMapper; + + @Override + public List selectAustralia() + { + return australiaMiddleEastMapper.selectAustralia(); + } + + @Override + public Integer DelAustralia(String id) { + return australiaMiddleEastMapper.DelAustralia(id); + + } + + @Override + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { + return australiaMiddleEastMapper.IntoAustralia(eastVO); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java index 0dc272c6a..850e17e9b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java @@ -1,11 +1,36 @@ package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.serviceyada.IGlobalEcologyService; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; +import com.ruoyi.system.serviceyada.IGlobalTypeService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; /** - * 全球生态环境监测 + * 全球各类型占比 * @Author: JinSheng Song * @Date: 2022/5/11 11:47 */ -public class GlobalEcologyServiceimpl implements IGlobalEcologyService { +public class GlobalTypeServiceimpl implements IGlobalTypeService { + + @Autowired + private AustraliaMiddleEastMapper australiaMiddleEastMapper; + + @Override + public List selectAustralia() + { + return australiaMiddleEastMapper.selectAustralia(); + } + + @Override + public Integer DelAustralia(String id) { + return australiaMiddleEastMapper.DelAustralia(id); + + } + + @Override + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { + return australiaMiddleEastMapper.IntoAustralia(eastVO); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java index 1bcddc14d..4e2a9f246 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java @@ -1,11 +1,36 @@ package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.serviceyada.IForestService; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; +import com.ruoyi.system.serviceyada.IOceanTemperatureService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; /** * 森林监测 * @Author: JinSheng Song * @Date: 2022/5/11 11:47 */ -public class ForestServiceimpl implements IForestService { +public class OceanTemperatureServiceimpl implements IOceanTemperatureService { + + @Autowired + private AustraliaMiddleEastMapper australiaMiddleEastMapper; + + @Override + public List selectAustralia() + { + return australiaMiddleEastMapper.selectAustralia(); + } + + @Override + public Integer DelAustralia(String id) { + return australiaMiddleEastMapper.DelAustralia(id); + + } + + @Override + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { + return australiaMiddleEastMapper.IntoAustralia(eastVO); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java index f6f06e26c..eaa8b905f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java @@ -1,11 +1,36 @@ package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.serviceyada.IENSOService; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; +import com.ruoyi.system.serviceyada.IRegionalSystemService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; /** - * ENSO影响监测 + * 区域生态系统 * @Author: JinSheng Song * @Date: 2022/5/11 11:46 */ -public class ENSOServiceimpl implements IENSOService { +public class RegionalSystemServiceimpl implements IRegionalSystemService { + + @Autowired + private AustraliaMiddleEastMapper australiaMiddleEastMapper; + + @Override + public List selectAustralia() + { + return australiaMiddleEastMapper.selectAustralia(); + } + + @Override + public Integer DelAustralia(String id) { + return australiaMiddleEastMapper.DelAustralia(id); + + } + + @Override + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { + return australiaMiddleEastMapper.IntoAustralia(eastVO); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java index 40addc703..b728c81f9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java @@ -8,4 +8,5 @@ import com.ruoyi.system.serviceyada.ISpecialReportService; * @Date: 2022/5/11 11:48 */ public class SpecialReportServiceimpl implements ISpecialReportService { + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java index c5a8637c8..1a63f5445 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java @@ -1,11 +1,37 @@ package com.ruoyi.system.serviceyada.impl; -import com.ruoyi.system.serviceyada.IAtmosphereService; +import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; +import com.ruoyi.system.serviceyada.IVegetationCoverageService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; /** - * 大气质量监测 + * 平均植被覆盖度和净初级生产力 * @Author: JinSheng Song * @Date: 2022/5/11 11:45 */ -public class AtmosphereServiceimpl implements IAtmosphereService { +public class VegetationCoverageServiceimpl implements IVegetationCoverageService { + + + @Autowired + private AustraliaMiddleEastMapper australiaMiddleEastMapper; + + @Override + public List selectAustralia() + { + return australiaMiddleEastMapper.selectAustralia(); + } + + @Override + public Integer DelAustralia(String id) { + return australiaMiddleEastMapper.DelAustralia(id); + + } + + @Override + public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { + return australiaMiddleEastMapper.IntoAustralia(eastVO); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index d3d0b771e..6c2bd79f3 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml index 8126b1b1d..40c87a5be 100644 --- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml index 6918f0a28..291d261e3 100644 --- a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml index dbf1c541c..e72f3cc24 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml index 1a029366d..809aa8bcb 100644 --- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file From 6006a9f18c7723793d34c44d3384bd70204bc5d5 Mon Sep 17 00:00:00 2001 From: qdxkrs <39894542+qdxkrs@users.noreply.github.com> Date: Fri, 20 May 2022 14:27:08 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yada/AorestCoverageController.java | 4 ++-- .../yada/AustraliaMiddleEastController.java | 4 ++-- .../controller/yada/GlobalTypeController.java | 4 ++-- .../yada/OceanTemperatureController.java | 4 ++-- .../controller/yada/RegionVGIController.java | 4 ++-- .../yada/RegionalSystemController.java | 4 ++-- .../web/controller/yada/UrbanController.java | 4 ++-- .../yada/VegetationCoverageController.java | 4 ++-- .../src/main/resources/application.yml | 2 +- .../yada}/AorestCoverageVO.java | 2 +- .../yada}/AustraliaMiddleEastVO.java | 2 +- .../yada}/GlobalTypeVO.java | 2 +- .../yada}/OceanTemperatureVO.java | 2 +- .../yada}/RegionVGIVO.java | 2 +- .../yada}/RegionalSystemVO.java | 2 +- .../domain/{ => yada}/SysBaseEntity.java | 24 +++++++------------ .../yada}/VegetationCoverageVO.java | 2 +- .../yada}/AorestCoverageMapper.java | 7 +----- .../yada}/AustraliaMiddleEastMapper.java | 4 ++-- .../yada}/GlobalTypeMapper.java | 7 +----- .../yada}/OceanTemperatureMapper.java | 7 +----- .../yada}/RegionVGIMapper.java | 4 ++-- .../yada}/RegionalSystemMapper.java | 7 +----- .../yada}/UrbanMapper.java | 2 +- .../yada}/VegetationCoverageMapper.java | 7 +----- .../IAorestCoverageService.java | 4 ++-- .../IAustraliaMiddleEastService.java | 4 ++-- .../IGlobalTypeService.java | 4 ++-- .../IOceanTemperatureService.java | 4 ++-- .../IRegionVGIService.java | 4 ++-- .../IRegionalSystemService.java | 4 ++-- .../ISpecialReportService.java | 2 +- .../IUrbanService.java | 2 +- .../IVegetationCoverageService.java | 4 ++-- .../impl/AorestCoverageServiceimpl.java | 8 +++---- .../impl/AustraliaMiddleEastServiceimpl.java | 8 +++---- .../impl/GlobalTypeServiceimpl.java | 8 +++---- .../impl/OceanTemperatureServiceimpl.java | 8 +++---- .../impl/RegionVGIServiceimpl.java | 8 +++---- .../impl/RegionalSystemServiceimpl.java | 8 +++---- .../impl/SpecialReportServiceimpl.java | 4 ++-- .../impl/UrbanServiceimpl.java | 4 ++-- .../impl/VegetationCoverageServiceimpl.java | 8 +++---- .../mapper/system/AorestCoverageMapper.xml | 2 +- .../system/AustraliaMiddleEastMapper.xml | 4 ++-- .../mapper/system/GlobalTypeMapper.xml | 2 +- .../mapper/system/OceanTemperatureMapper.xml | 2 +- .../mapper/system/RegionVGIMapper.xml | 4 ++-- .../mapper/system/RegionalSystemMapper.xml | 2 +- .../resources/mapper/system/UrbanMapper.xml | 2 +- .../system/VegetationCoverageMapper.xml | 2 +- 51 files changed, 100 insertions(+), 133 deletions(-) rename ruoyi-system/src/main/java/com/ruoyi/system/{domainyada => domain/yada}/AorestCoverageVO.java (90%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domainyada => domain/yada}/AustraliaMiddleEastVO.java (98%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domainyada => domain/yada}/GlobalTypeVO.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domainyada => domain/yada}/OceanTemperatureVO.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domainyada => domain/yada}/RegionVGIVO.java (98%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domainyada => domain/yada}/RegionalSystemVO.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/domain/{ => yada}/SysBaseEntity.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domainyada => domain/yada}/VegetationCoverageVO.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapperyada => mapper/yada}/AorestCoverageMapper.java (62%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapperyada => mapper/yada}/AustraliaMiddleEastMapper.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapperyada => mapper/yada}/GlobalTypeMapper.java (62%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapperyada => mapper/yada}/OceanTemperatureMapper.java (62%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapperyada => mapper/yada}/RegionVGIMapper.java (77%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapperyada => mapper/yada}/RegionalSystemMapper.java (62%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapperyada => mapper/yada}/UrbanMapper.java (71%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapperyada => mapper/yada}/VegetationCoverageMapper.java (62%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/IAorestCoverageService.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/IAustraliaMiddleEastService.java (80%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/IGlobalTypeService.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/IOceanTemperatureService.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/IRegionVGIService.java (84%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/IRegionalSystemService.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/ISpecialReportService.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/IUrbanService.java (74%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/IVegetationCoverageService.java (80%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/AorestCoverageServiceimpl.java (76%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/AustraliaMiddleEastServiceimpl.java (76%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/GlobalTypeServiceimpl.java (76%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/OceanTemperatureServiceimpl.java (76%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/RegionVGIServiceimpl.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/RegionalSystemServiceimpl.java (76%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/SpecialReportServiceimpl.java (59%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/UrbanServiceimpl.java (59%) rename ruoyi-system/src/main/java/com/ruoyi/system/{serviceyada => service_yada}/impl/VegetationCoverageServiceimpl.java (77%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index 53ec82ed7..6741b47a8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index 17761b99b..b94786060 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java index 18fd74092..b52e637af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java index 645e6179b..6da1ac27d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java index 0f1e81cb3..dc1060c4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.serviceyada.IRegionVGIService; -import com.ruoyi.system.domainyada.RegionVGIVO; +import com.ruoyi.system.service_yada.IRegionVGIService; +import com.ruoyi.system.domain.yada.RegionVGIVO; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java index 68aca4bdc..7d50baff3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index 734e03acb..0d52b1a92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index a66eea635..5081c8a3b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -1,8 +1,8 @@ package com.ruoyi.web.controller.yada; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0bbaeb4f1..eda7f36e9 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -71,7 +71,7 @@ spring: # 数据库索引 database: 3 # 密码 - password: yhy_app + password: sdust2020 # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AorestCoverageVO.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AorestCoverageVO.java index 83b23e077..f1a2121a8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AorestCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AorestCoverageVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domainyada; +package com.ruoyi.system.domain.yada; /** * 森林覆盖率 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AustraliaMiddleEastVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AustraliaMiddleEastVO.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AustraliaMiddleEastVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AustraliaMiddleEastVO.java index 735bf4a95..e699b78cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/AustraliaMiddleEastVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AustraliaMiddleEastVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domainyada; +package com.ruoyi.system.domain.yada; import java.time.LocalDate; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/GlobalTypeVO.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/GlobalTypeVO.java index f80dd6efa..e5a664897 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/GlobalTypeVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/GlobalTypeVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domainyada; +package com.ruoyi.system.domain.yada; /** * 全球各类型占比 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/OceanTemperatureVO.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/OceanTemperatureVO.java index f544b37a7..85c26b8fc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/OceanTemperatureVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/OceanTemperatureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domainyada; +package com.ruoyi.system.domain.yada; /**+ * 海面温度监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionVGIVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionVGIVO.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionVGIVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionVGIVO.java index 6e17ed2a5..f6172ffa1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionVGIVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionVGIVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domainyada; +package com.ruoyi.system.domain.yada; import java.io.Serializable; import java.time.LocalDate; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionalSystemVO.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionalSystemVO.java index 8e5a71084..4ee6f5c5a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/RegionalSystemVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionalSystemVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domainyada; +package com.ruoyi.system.domain.yada; /** * 区域生态系统 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysBaseEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/SysBaseEntity.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysBaseEntity.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/SysBaseEntity.java index 430d60c88..5fc2fd9c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysBaseEntity.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/SysBaseEntity.java @@ -1,9 +1,7 @@ -package com.ruoyi.system.domain; - -import com.fasterxml.jackson.annotation.JsonFormat; +package com.ruoyi.system.domain.yada; import java.io.Serializable; -import java.util.Date; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; @@ -20,15 +18,13 @@ public class SysBaseEntity implements Serializable private String createBy; /** 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private LocalDateTime createTime; /** 更新者 */ private String updateBy; /** 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + private LocalDateTime updateTime; /** 备注 */ private String remark; @@ -46,13 +42,11 @@ public class SysBaseEntity implements Serializable this.createBy = createBy; } - public Date getCreateTime() - { + public LocalDateTime getCreateTime() { return createTime; } - public void setCreateTime(Date createTime) - { + public void setCreateTime(LocalDateTime createTime) { this.createTime = createTime; } @@ -66,13 +60,11 @@ public class SysBaseEntity implements Serializable this.updateBy = updateBy; } - public Date getUpdateTime() - { + public LocalDateTime getUpdateTime() { return updateTime; } - public void setUpdateTime(Date updateTime) - { + public void setUpdateTime(LocalDateTime updateTime) { this.updateTime = updateTime; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/VegetationCoverageVO.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/VegetationCoverageVO.java index fe24bd80b..7ad480ba7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domainyada/VegetationCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/VegetationCoverageVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domainyada; +package com.ruoyi.system.domain.yada; /** * 平均植被覆盖度和净初级生产力 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AorestCoverageMapper.java similarity index 62% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AorestCoverageMapper.java index 40d584ab1..f0a7188ee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AorestCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AorestCoverageMapper.java @@ -1,9 +1,4 @@ -package com.ruoyi.system.mapperyada; - -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +package com.ruoyi.system.mapper.yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AustraliaMiddleEastMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AustraliaMiddleEastMapper.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AustraliaMiddleEastMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AustraliaMiddleEastMapper.java index 1725f2efd..a0577cb1a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/AustraliaMiddleEastMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AustraliaMiddleEastMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapperyada; +package com.ruoyi.system.mapper.yada; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/GlobalTypeMapper.java similarity index 62% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/GlobalTypeMapper.java index 4bddaa24b..6086f06f2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/GlobalTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/GlobalTypeMapper.java @@ -1,9 +1,4 @@ -package com.ruoyi.system.mapperyada; - -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +package com.ruoyi.system.mapper.yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/OceanTemperatureMapper.java similarity index 62% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/OceanTemperatureMapper.java index e8c3c51c5..abd64c795 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/OceanTemperatureMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/OceanTemperatureMapper.java @@ -1,9 +1,4 @@ -package com.ruoyi.system.mapperyada; - -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +package com.ruoyi.system.mapper.yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionVGIMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionVGIMapper.java similarity index 77% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionVGIMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionVGIMapper.java index e339fd37b..980722926 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionVGIMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionVGIMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapperyada; +package com.ruoyi.system.mapper.yada; -import com.ruoyi.system.domainyada.RegionVGIVO; +import com.ruoyi.system.domain.yada.RegionVGIVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionalSystemMapper.java similarity index 62% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionalSystemMapper.java index 55b39ac71..c07b3c37b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/RegionalSystemMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionalSystemMapper.java @@ -1,9 +1,4 @@ -package com.ruoyi.system.mapperyada; - -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +package com.ruoyi.system.mapper.yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/UrbanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/UrbanMapper.java similarity index 71% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/UrbanMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/UrbanMapper.java index e6840960a..563d57327 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/UrbanMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/UrbanMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapperyada; +package com.ruoyi.system.mapper.yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/VegetationCoverageMapper.java similarity index 62% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/VegetationCoverageMapper.java index d06a59332..6a333c090 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapperyada/VegetationCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/VegetationCoverageMapper.java @@ -1,9 +1,4 @@ -package com.ruoyi.system.mapperyada; - -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import org.apache.ibatis.annotations.Param; - -import java.util.List; +package com.ruoyi.system.mapper.yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java index 1921e4d16..007368eaf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAorestCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAustraliaMiddleEastService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java similarity index 80% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAustraliaMiddleEastService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java index 7f0e9fa5e..fffc04126 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IAustraliaMiddleEastService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java index 01940f7b4..6f1261472 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IGlobalTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java index c8240d3d3..df72f6dc8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IOceanTemperatureService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionVGIService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java similarity index 84% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionVGIService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java index 7ceb2dfb1..85d489453 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionVGIService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; -import com.ruoyi.system.domainyada.RegionVGIVO; +import com.ruoyi.system.domain.yada.RegionVGIVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java index ee8fd34bd..470d34059 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IRegionalSystemService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/ISpecialReportService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/ISpecialReportService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java index cf8a3ddc6..0f677a36c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/ISpecialReportService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; /** * 专题报告 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IUrbanService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java similarity index 74% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IUrbanService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java index 87d2ee389..06bff3eb0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IUrbanService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; /** * 城市监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java similarity index 80% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java index 735ef2b19..4feac0d28 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/IVegetationCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada; +package com.ruoyi.system.service_yada; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java similarity index 76% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index 43fda2ee2..c24c0f843 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; -import com.ruoyi.system.serviceyada.IAorestCoverageService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.service_yada.IAorestCoverageService; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AustraliaMiddleEastServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java similarity index 76% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AustraliaMiddleEastServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java index 08f5bdbdc..c3b56bad9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/AustraliaMiddleEastServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; -import com.ruoyi.system.serviceyada.IAustraliaMiddleEastService; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; +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 java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java similarity index 76% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java index 850e17e9b..eeaa8e3ea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/GlobalTypeServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; -import com.ruoyi.system.serviceyada.IGlobalTypeService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.service_yada.IGlobalTypeService; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java similarity index 76% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java index 4e2a9f246..db85e5e8a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/OceanTemperatureServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; -import com.ruoyi.system.serviceyada.IOceanTemperatureService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.service_yada.IOceanTemperatureService; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionVGIServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionVGIServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java index c43c34507..f96daf849 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionVGIServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.mapperyada.RegionVGIMapper; -import com.ruoyi.system.serviceyada.IRegionVGIService; -import com.ruoyi.system.domainyada.RegionVGIVO; +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 java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java similarity index 76% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java index eaa8b905f..3d157e217 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/RegionalSystemServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; -import com.ruoyi.system.serviceyada.IRegionalSystemService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.service_yada.IRegionalSystemService; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java similarity index 59% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java index b728c81f9..e96cd19b8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/SpecialReportServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.serviceyada.ISpecialReportService; +import com.ruoyi.system.service_yada.ISpecialReportService; /** * 专题报告 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/UrbanServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java similarity index 59% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/UrbanServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java index 5a27f5bd5..d5c77966d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/UrbanServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.serviceyada.IUrbanService; +import com.ruoyi.system.service_yada.IUrbanService; /** * * 城市监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java similarity index 77% rename from ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java rename to ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java index 1a63f5445..ce42b685c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/serviceyada/impl/VegetationCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.serviceyada.impl; +package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domainyada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapperyada.AustraliaMiddleEastMapper; -import com.ruoyi.system.serviceyada.IVegetationCoverageService; +import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.service_yada.IVegetationCoverageService; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index 6c2bd79f3..eb2b30cb7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index f0f216d0c..a07f1cca8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml index 40c87a5be..9cb3c61dc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml index 291d261e3..036b0f002 100644 --- a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml index 1b062c0bc..6fe8d1929 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml @@ -2,8 +2,8 @@ - - + + diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml index e72f3cc24..1c7e73857 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml index 1d12cf809..17f090649 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml index 809aa8bcb..5c1c63177 100644 --- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file From c6fa4153565b00444f0bac9d6b7f30d3e5001b70 Mon Sep 17 00:00:00 2001 From: qdxkrs <39894542+qdxkrs@users.noreply.github.com> Date: Fri, 20 May 2022 14:42:13 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/yada/AorestCoverageController.java | 2 +- .../web/controller/yada/AustraliaMiddleEastController.java | 2 +- .../com/ruoyi/web/controller/yada/GlobalTypeController.java | 2 +- .../ruoyi/web/controller/yada/OceanTemperatureController.java | 2 +- .../com/ruoyi/web/controller/yada/RegionVGIController.java | 2 +- .../ruoyi/web/controller/yada/RegionalSystemController.java | 2 +- .../java/com/ruoyi/web/controller/yada/UrbanController.java | 2 +- .../web/controller/yada/VegetationCoverageController.java | 2 +- .../system/{domain/yada => domain_yada}/AorestCoverageVO.java | 2 +- .../{domain/yada => domain_yada}/AustraliaMiddleEastVO.java | 2 +- .../system/{domain/yada => domain_yada}/GlobalTypeVO.java | 2 +- .../{domain/yada => domain_yada}/OceanTemperatureVO.java | 2 +- .../system/{domain/yada => domain_yada}/RegionVGIVO.java | 2 +- .../system/{domain/yada => domain_yada}/RegionalSystemVO.java | 2 +- .../system/{domain/yada => domain_yada}/SysBaseEntity.java | 2 +- .../{domain/yada => domain_yada}/VegetationCoverageVO.java | 2 +- .../{mapper/yada => mapper_yada}/AorestCoverageMapper.java | 2 +- .../yada => mapper_yada}/AustraliaMiddleEastMapper.java | 4 ++-- .../system/{mapper/yada => mapper_yada}/GlobalTypeMapper.java | 2 +- .../{mapper/yada => mapper_yada}/OceanTemperatureMapper.java | 2 +- .../system/{mapper/yada => mapper_yada}/RegionVGIMapper.java | 4 ++-- .../{mapper/yada => mapper_yada}/RegionalSystemMapper.java | 2 +- .../system/{mapper/yada => mapper_yada}/UrbanMapper.java | 2 +- .../yada => mapper_yada}/VegetationCoverageMapper.java | 2 +- .../com/ruoyi/system/service_yada/IAorestCoverageService.java | 2 +- .../system/service_yada/IAustraliaMiddleEastService.java | 2 +- .../com/ruoyi/system/service_yada/IGlobalTypeService.java | 2 +- .../ruoyi/system/service_yada/IOceanTemperatureService.java | 2 +- .../java/com/ruoyi/system/service_yada/IRegionVGIService.java | 2 +- .../com/ruoyi/system/service_yada/IRegionalSystemService.java | 2 +- .../ruoyi/system/service_yada/IVegetationCoverageService.java | 2 +- .../system/service_yada/impl/AorestCoverageServiceimpl.java | 4 ++-- .../service_yada/impl/AustraliaMiddleEastServiceimpl.java | 4 ++-- .../ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java | 4 ++-- .../system/service_yada/impl/OceanTemperatureServiceimpl.java | 4 ++-- .../ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java | 4 ++-- .../system/service_yada/impl/RegionalSystemServiceimpl.java | 4 ++-- .../service_yada/impl/VegetationCoverageServiceimpl.java | 4 ++-- .../resources/mapper/system/AustraliaMiddleEastMapper.xml | 2 +- .../src/main/resources/mapper/system/RegionVGIMapper.xml | 2 +- 40 files changed, 49 insertions(+), 49 deletions(-) rename ruoyi-system/src/main/java/com/ruoyi/system/{domain/yada => domain_yada}/AorestCoverageVO.java (90%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domain/yada => domain_yada}/AustraliaMiddleEastVO.java (98%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domain/yada => domain_yada}/GlobalTypeVO.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domain/yada => domain_yada}/OceanTemperatureVO.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domain/yada => domain_yada}/RegionVGIVO.java (98%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domain/yada => domain_yada}/RegionalSystemVO.java (75%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domain/yada => domain_yada}/SysBaseEntity.java (97%) rename ruoyi-system/src/main/java/com/ruoyi/system/{domain/yada => domain_yada}/VegetationCoverageVO.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper/yada => mapper_yada}/AorestCoverageMapper.java (87%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper/yada => mapper_yada}/AustraliaMiddleEastMapper.java (79%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper/yada => mapper_yada}/GlobalTypeMapper.java (87%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper/yada => mapper_yada}/OceanTemperatureMapper.java (87%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper/yada => mapper_yada}/RegionVGIMapper.java (77%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper/yada => mapper_yada}/RegionalSystemMapper.java (87%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper/yada => mapper_yada}/UrbanMapper.java (71%) rename ruoyi-system/src/main/java/com/ruoyi/system/{mapper/yada => mapper_yada}/VegetationCoverageMapper.java (87%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index 6741b47a8..e4c956707 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -1,7 +1,7 @@ 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.AustraliaMiddleEastVO; import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index b94786060..b5a34ba35 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -2,7 +2,7 @@ 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 com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java index b52e637af..3688a405b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java @@ -1,7 +1,7 @@ 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.AustraliaMiddleEastVO; import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java index 6da1ac27d..a49c90257 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java @@ -1,7 +1,7 @@ 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.AustraliaMiddleEastVO; import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java index dc1060c4d..0c5dfd53d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java @@ -2,7 +2,7 @@ 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 com.ruoyi.system.domain_yada.RegionVGIVO; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java index 7d50baff3..b4e368ef1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java @@ -1,7 +1,7 @@ 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.AustraliaMiddleEastVO; import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index 0d52b1a92..e37af0c41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -1,7 +1,7 @@ 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.AustraliaMiddleEastVO; import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index 5081c8a3b..9c898ed93 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -1,7 +1,7 @@ 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.AustraliaMiddleEastVO; import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AorestCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AorestCoverageVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java index f1a2121a8..697d73bc4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AorestCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.yada; +package com.ruoyi.system.domain_yada; /** * 森林覆盖率 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AustraliaMiddleEastVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AustraliaMiddleEastVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java index e699b78cb..48f77d2fd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/AustraliaMiddleEastVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.yada; +package com.ruoyi.system.domain_yada; import java.time.LocalDate; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/GlobalTypeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/GlobalTypeVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java index e5a664897..4666755e3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/GlobalTypeVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.yada; +package com.ruoyi.system.domain_yada; /** * 全球各类型占比 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/OceanTemperatureVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/OceanTemperatureVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java index 85c26b8fc..79d7aa622 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/OceanTemperatureVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.yada; +package com.ruoyi.system.domain_yada; /**+ * 海面温度监测 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionVGIVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionVGIVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java index f6172ffa1..49bb6f307 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionVGIVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.yada; +package com.ruoyi.system.domain_yada; import java.io.Serializable; import java.time.LocalDate; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionalSystemVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java similarity index 75% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionalSystemVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java index 4ee6f5c5a..7f807bbb1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/RegionalSystemVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.yada; +package com.ruoyi.system.domain_yada; /** * 区域生态系统 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/SysBaseEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/SysBaseEntity.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java index 5fc2fd9c5..bdef7faee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/SysBaseEntity.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.yada; +package com.ruoyi.system.domain_yada; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/VegetationCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/VegetationCoverageVO.java rename to ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java index 7ad480ba7..c0f8daa65 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/yada/VegetationCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.yada; +package com.ruoyi.system.domain_yada; /** * 平均植被覆盖度和净初级生产力 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AorestCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AorestCoverageMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java index f0a7188ee..ddce23614 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AorestCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper.yada; +package com.ruoyi.system.mapper_yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AustraliaMiddleEastMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AustraliaMiddleEastMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java index a0577cb1a..3f2aceefa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/AustraliaMiddleEastMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AustraliaMiddleEastMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper.yada; +package com.ruoyi.system.mapper_yada; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/GlobalTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/GlobalTypeMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java index 6086f06f2..ca10f21a6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/GlobalTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper.yada; +package com.ruoyi.system.mapper_yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/OceanTemperatureMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/OceanTemperatureMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java index abd64c795..ff5594d07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/OceanTemperatureMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper.yada; +package com.ruoyi.system.mapper_yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionVGIMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java similarity index 77% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionVGIMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java index 980722926..601e56c28 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionVGIMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionVGIMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.mapper.yada; +package com.ruoyi.system.mapper_yada; -import com.ruoyi.system.domain.yada.RegionVGIVO; +import com.ruoyi.system.domain_yada.RegionVGIVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionalSystemMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionalSystemMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java index c07b3c37b..9fde98f60 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/RegionalSystemMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper.yada; +package com.ruoyi.system.mapper_yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/UrbanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java similarity index 71% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/UrbanMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java index 563d57327..a3e80c76c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/UrbanMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper.yada; +package com.ruoyi.system.mapper_yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/VegetationCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/VegetationCoverageMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java index 6a333c090..977c0d111 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/yada/VegetationCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.mapper.yada; +package com.ruoyi.system.mapper_yada; /** * @Author: JinSheng Song diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java index 007368eaf..b43289501 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service_yada; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java index fffc04126..ad863b16d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAustraliaMiddleEastService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service_yada; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java index 6f1261472..3d9787e52 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service_yada; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java index df72f6dc8..ce17df7ef 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service_yada; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java index 85d489453..489c2d448 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionVGIService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service_yada; -import com.ruoyi.system.domain.yada.RegionVGIVO; +import com.ruoyi.system.domain_yada.RegionVGIVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java index 470d34059..9a7126571 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service_yada; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java index 4feac0d28..be6e70782 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service_yada; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index c24c0f843..007d88880 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IAorestCoverageService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java index c3b56bad9..69eaec77d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java index eeaa8e3ea..905344219 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IGlobalTypeService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java index db85e5e8a..5f80f27be 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IOceanTemperatureService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java index f96daf849..7218cb98b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.mapper.yada.RegionVGIMapper; +import com.ruoyi.system.mapper_yada.RegionVGIMapper; import com.ruoyi.system.service_yada.IRegionVGIService; -import com.ruoyi.system.domain.yada.RegionVGIVO; +import com.ruoyi.system.domain_yada.RegionVGIVO; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java index 3d157e217..08933a0ac 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IRegionalSystemService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java index ce42b685c..62b71f4ae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java @@ -1,7 +1,7 @@ package com.ruoyi.system.service_yada.impl; -import com.ruoyi.system.domain.yada.AustraliaMiddleEastVO; -import com.ruoyi.system.mapper.yada.AustraliaMiddleEastMapper; +import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; +import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IVegetationCoverageService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index a07f1cca8..fd27fae43 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml index 6fe8d1929..f3e5328db 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + From afa068f47780a71aad9f8566c1f9068504ee5730 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Fri, 20 May 2022 15:17:51 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../system/domain_yada/AorestCoverageVO.java | 65 ++++++++++++++++++- .../mapper/system/AorestCoverageMapper.xml | 2 +- .../system/AustraliaMiddleEastMapper.xml | 2 +- .../mapper/system/GlobalTypeMapper.xml | 2 +- .../mapper/system/OceanTemperatureMapper.xml | 2 +- .../mapper/system/RegionVGIMapper.xml | 2 +- .../mapper/system/RegionalSystemMapper.xml | 2 +- .../resources/mapper/system/UrbanMapper.xml | 2 +- .../system/VegetationCoverageMapper.xml | 2 +- 10 files changed, 73 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index eda7f36e9..0bbaeb4f1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -71,7 +71,7 @@ spring: # 数据库索引 database: 3 # 密码 - password: sdust2020 + password: yhy_app # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java index 697d73bc4..02fea0533 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java @@ -5,7 +5,7 @@ package com.ruoyi.system.domain_yada; * @Author: JinSheng Song * @Date: 2022/5/20 14:06 */ -public class AorestCoverageVO { +public class AorestCoverageVO extends SysBaseEntity { private String id; @@ -23,4 +23,67 @@ public class AorestCoverageVO { private String 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 String getProtectedLands() { + return protectedLands; + } + + public void setProtectedLands(String protectedLands) { + this.protectedLands = protectedLands; + } + + public String getNonProtectedLands() { + return nonProtectedLands; + } + + public void setNonProtectedLands(String nonProtectedLands) { + this.nonProtectedLands = nonProtectedLands; + } + + public String getMountain() { + return mountain; + } + + public void setMountain(String mountain) { + this.mountain = mountain; + } + + public String getNonMountain() { + return nonMountain; + } + + public void setNonMountain(String nonMountain) { + this.nonMountain = nonMountain; + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index eb2b30cb7..2f5f8d371 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index fd27fae43..83a9015e8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml index 9cb3c61dc..1c423e4d2 100644 --- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml index 036b0f002..588e289d3 100644 --- a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml index f3e5328db..e4dea3357 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml index 1c7e73857..e1db72f9d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml index 17f090649..45ba48a7d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml index 5c1c63177..da8ae0ab5 100644 --- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file From a51c6872d866b1e4b6236f3aade961c2b87c0ca8 Mon Sep 17 00:00:00 2001 From: qdxkrs <39894542+qdxkrs@users.noreply.github.com> Date: Fri, 20 May 2022 16:59:45 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E9=A3=9E=E6=9C=BA=E2=9C=88=E4=BF=9D?= =?UTF-8?q?=E4=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/RuoYiApplication.java | 2 + .../yada/ThematicMapController.java | 70 +++++++++ .../src/main/resources/application.yml | 6 +- ruoyi-admin/src/main/resources/banner.txt | 48 ++++--- .../system/domain_yada/SysBaseEntity.java | 56 ++++---- .../system/domain_yada/ThematicMapDomain.java | 133 ++++++++++++++++++ .../domain_yada/VegetationCoverageVO.java | 6 +- .../system/mapper_yada/ThematicMapMapper.java | 34 +++++ .../service_yada/ThematicMapService.java | 36 +++++ .../impl/ThematicMapServiceImpl.java | 49 +++++++ .../mapper/system/ThematicMapMapper.xml | 63 +++++++++ 11 files changed, 449 insertions(+), 54 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 9639bc9c3..01606a4d8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/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; @@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * * @author ruoyi */ +@MapperScan("com.ruoyi.system.mapper_yada") @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) public class RuoYiApplication { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java new file mode 100644 index 000000000..be6286759 --- /dev/null +++ b/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 = "/api/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 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(); + } +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0bbaeb4f1..1111fce20 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -71,7 +71,7 @@ spring: # 数据库索引 database: 3 # 密码 - password: yhy_app + password: sdust2020 # 连接超时时间 timeout: 10s lettuce: @@ -97,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 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index a02645ec3..8e65fd3ab 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -1,24 +1,34 @@ Application Version: ${ruoyi.version} Spring Boot Version: ${spring-boot.version} //////////////////////////////////////////////////////////////////// -// _ooOoo_ // -// o6666666o // -// 88" . "88 // -// (| ^_^ |) // -// O\ = /O // -// ____/`---'\____ // -// .' \\| |// `. // -// / \\||| : |||// \ // -// / _||||| -:- |||||- \ // -// | | \\\ - /// | | // -// | \_| ''\---/'' | | // -// \ .-\__ `-` ___/-. / // -// ___`. .' /--.--\ `. . ___ // -// ."" '< `.___\_<|>_/___.' >'"". // -// | | : `- \`.;`\ _ /`;.`/ - ` : | | // -// \ \ `-. \_ __\ /__ _/ .-` / / // -// ========`-.____`-.___\_____/___.-`____.-'======== // -// `=---=' // + /\ + | | + | | + .' '. + | | + | | + | /\ | + .' |__|'. + | | | | + .' | | '. + /\ | \__/ | /\ + | | | | | | | | + /| | |,-\ | | /-,| | |\ + || |,-' | | | | '-,| || + ||-' | | | | '-|| +|\ _,-' | | | | '-,_ /| +|| ,-' _ | | | | '-, || +||-' =(*)= | | | | '-|| +|| | \ / | || +|\________....--------\ || /--------....________/| + /| || |\ + / | || | \ + / | \/ | \ + / | | \ + // .| |. \\ + .' |_./ | | \._| '. + / _.-||| |||-._ \ + \__.-' \||/\||/ '-.__/ // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 佛祖保佑 永不宕机 永无BUG // +// 飞机保佑 永不宕机 永无BUG // //////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java index bdef7faee..527685c9c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java @@ -15,67 +15,61 @@ public class SysBaseEntity implements Serializable private static final long serialVersionUID = 1L; /** 创建者 */ - private String createBy; + private String createdBy; /** 创建时间 */ - private LocalDateTime createTime; + private LocalDateTime createdTime; /** 更新者 */ - private String updateBy; + private String updatedBy; /** 更新时间 */ - private LocalDateTime updateTime; + private LocalDateTime updatedTime; /** 备注 */ - private String remark; + private String remarks; /** 请求参数 */ private Map params; - public String getCreateBy() - { - return createBy; + public String getCreatedBy() { + return createdBy; } - public void setCreateBy(String createBy) - { - this.createBy = createBy; + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; } - public LocalDateTime getCreateTime() { - return createTime; + public LocalDateTime getCreatedTime() { + return createdTime; } - public void setCreateTime(LocalDateTime createTime) { - this.createTime = createTime; + public void setCreatedTime(LocalDateTime createdTime) { + this.createdTime = createdTime; } - public String getUpdateBy() - { - return updateBy; + public String getUpdatedBy() { + return updatedBy; } - public void setUpdateBy(String updateBy) - { - this.updateBy = updateBy; + public void setUpdatedBy(String updatedBy) { + this.updatedBy = updatedBy; } - public LocalDateTime getUpdateTime() { - return updateTime; + public LocalDateTime getUpdatedTime() { + return updatedTime; } - public void setUpdateTime(LocalDateTime updateTime) { - this.updateTime = updateTime; + public void setUpdatedTime(LocalDateTime updatedTime) { + this.updatedTime = updatedTime; } - public String getRemark() - { - return remark; + public String getRemarks() { + return remarks; } - public void setRemark(String remark) - { - this.remark = remark; + public void setRemarks(String remarks) { + this.remarks = remarks; } public Map getParams() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java new file mode 100644 index 000000000..49908b895 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java @@ -0,0 +1,133 @@ +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; + } + + @Override + public String getRemarks() { + return remarks; + } + + @Override + public void setRemarks(String remarks) { + this.remarks = remarks; + } + + @Override + public String getCreatedBy() { + return createdBy; + } + + @Override + public void setCreatedBy(String createdBy) { + this.createdBy = createdBy; + } + + @Override + public LocalDateTime getCreatedTime() { + return createdTime; + } + + @Override + 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 + + '}'; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java index c0f8daa65..e23064064 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java @@ -1,9 +1,13 @@ package com.ruoyi.system.domain_yada; +import java.time.LocalDateTime; + /** * 平均植被覆盖度和净初级生产力 * @Author: JinSheng Song * @Date: 2022/5/20 14:09 */ -public class VegetationCoverageVO { +public class VegetationCoverageVO extends SysBaseEntity { + + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/ThematicMapMapper.java new file mode 100644 index 000000000..3b03a98ab --- /dev/null +++ b/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 selectAllThematicMap(); + + /** + * 删除专题图根据编号 + * @param id 编号 + * @return + */ + Integer deleteThematicMap(Long id); + + /** + * 保存专题图 + * @param thematicMapDomain + * @return + */ + Integer saveThematicMap(ThematicMapDomain thematicMapDomain); + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ThematicMapService.java new file mode 100644 index 000000000..2c46ef4b6 --- /dev/null +++ b/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 selectAll(); + + /** + * 删除专题图根据编号 + * @param id 编号 + * @return + */ + Integer deleteById(Long id); + + /** + * 保存专题图 + * @param thematicMapDomain + * @return + */ + Integer save(ThematicMapDomain thematicMapDomain); + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/ThematicMapServiceImpl.java new file mode 100644 index 000000000..3231ee023 --- /dev/null +++ b/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 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); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml new file mode 100644 index 000000000..8bc6ab2a5 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + DELETE FROM thematic_map + WHERE ID=#{id} + + + + + + + \ No newline at end of file From d262ec6b724579ffa4d373a1309fb08a073f05a2 Mon Sep 17 00:00:00 2001 From: qdxkrs <39894542+qdxkrs@users.noreply.github.com> Date: Mon, 23 May 2022 09:39:52 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/yada/ThematicMapController.java | 2 +- ruoyi-admin/src/main/resources/application.yml | 3 ++- ruoyi-ui/.env.development | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java index be6286759..3b01a3023 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java @@ -19,7 +19,7 @@ import java.util.List; * @Date: 2022/5/11 10:55 */ @RestController -@RequestMapping(value = "/api/thematic-map") +@RequestMapping(value = "/thematic-map") public class ThematicMapController { @Resource diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 1111fce20..a65a211fe 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -18,7 +18,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 9900 servlet: # 应用的访问路径 context-path: / @@ -116,6 +116,7 @@ swagger: # 请求前缀 pathMapping: /dev-api + # 防止XSS攻击 xss: # 过滤开关 diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 18b2a3ed4..6f3363e21 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 若依管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = '/dev-api' +VUE_APP_BASE_API = 'http://192.168.2.105:9900' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true From 7cfae514eab0dfca09db2ff7107d7ba789dd7c21 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Mon, 23 May 2022 09:42:20 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yada/AorestCoverageController.java | 22 ++--- .../controller/yada/GlobalTypeController.java | 22 ++--- .../yada/OceanTemperatureController.java | 20 +++-- .../yada/RegionalSystemController.java | 23 ++--- .../web/controller/yada/UrbanController.java | 22 ++--- .../yada/VegetationCoverageController.java | 22 ++--- .../src/main/resources/application.yml | 2 +- .../system/domain_yada/AorestCoverageVO.java | 24 +++--- .../domain_yada/AustraliaMiddleEastVO.java | 23 +++-- .../system/domain_yada/GlobalTypeVO.java | 62 +++++++++++++- .../domain_yada/OceanTemperatureVO.java | 55 +++++++++++- .../system/domain_yada/RegionalSystemVO.java | 72 +++++++++++++++- .../com/ruoyi/system/domain_yada/UrbanVO.java | 61 ++++++++++++++ .../domain_yada/VegetationCoverageVO.java | 84 ++++++++++++++++++- .../mapper_yada/AorestCoverageMapper.java | 15 ++-- .../system/mapper_yada/GlobalTypeMapper.java | 15 ++-- .../mapper_yada/OceanTemperatureMapper.java | 16 ++-- .../mapper_yada/RegionalSystemMapper.java | 15 ++-- .../ruoyi/system/mapper_yada/UrbanMapper.java | 12 +++ .../mapper_yada/VegetationCoverageMapper.java | 15 ++-- .../service_yada/IAorestCoverageService.java | 7 +- .../service_yada/IGlobalTypeService.java | 7 +- .../IOceanTemperatureService.java | 7 +- .../service_yada/IRegionalSystemService.java | 7 +- .../system/service_yada/IUrbanService.java | 11 +++ .../IVegetationCoverageService.java | 7 +- .../impl/AorestCoverageServiceimpl.java | 19 +++-- .../impl/GlobalTypeServiceimpl.java | 19 +++-- .../impl/OceanTemperatureServiceimpl.java | 19 +++-- .../impl/RegionalSystemServiceimpl.java | 20 +++-- .../service_yada/impl/UrbanServiceimpl.java | 25 ++++++ .../impl/VegetationCoverageServiceimpl.java | 19 +++-- .../mapper/system/AorestCoverageMapper.xml | 56 +++++++++++++ .../system/AustraliaMiddleEastMapper.xml | 2 +- .../mapper/system/GlobalTypeMapper.xml | 50 +++++++++++ .../mapper/system/OceanTemperatureMapper.xml | 47 +++++++++++ .../mapper/system/RegionalSystemMapper.xml | 52 ++++++++++++ .../resources/mapper/system/UrbanMapper.xml | 47 +++++++++++ .../system/VegetationCoverageMapper.xml | 55 ++++++++++++ 39 files changed, 904 insertions(+), 174 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UrbanVO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index e4c956707..e805a6d1b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -1,7 +1,9 @@ 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.web.bind.annotation.RequestMapping; @@ -21,7 +23,7 @@ import java.util.List; @RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8") public class AorestCoverageController { //@Autowired - private IAustraliaMiddleEastService australiaMiddleEastService; + private IAorestCoverageService service; /** * 查询方法 @@ -29,10 +31,10 @@ public class AorestCoverageController { * @param request * @return */ - @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) - public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.POST}) + public AjaxResult selectAorestCoverage(HttpServletResponse response, HttpServletRequest request) { - List eastVOSList= australiaMiddleEastService.selectAustralia(); + List eastVOSList= service.selectAorestCoverage(); return AjaxResult.success(eastVOSList); } @@ -41,10 +43,10 @@ public class AorestCoverageController { * @param ID * @return */ - @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST}) - public AjaxResult DelAustralia(@Param("ID") String ID) + @RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.POST}) + public AjaxResult DelAorestCoverage(@Param("ID") String ID) { - int NUM = australiaMiddleEastService.DelAustralia(ID); + int NUM = service.DelAorestCoverage(ID); if (NUM>0) { return AjaxResult.success(); @@ -58,10 +60,10 @@ public class AorestCoverageController { * @param eastVOS * @return */ - @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS) + @RequestMapping(value = "/IntoAorestCoverage",method = {RequestMethod.POST}) + public AjaxResult IntoAorestCoverage(AorestCoverageVO eastVOS) { - int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); + int NUM = service.IntoAorestCoverage(eastVOS); if (NUM>0) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java index 3688a405b..13412d4f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java @@ -2,7 +2,9 @@ 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.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -21,7 +23,7 @@ import java.util.List; @RequestMapping("/monitor/clobal") public class GlobalTypeController { //@Autowired - private IAustraliaMiddleEastService australiaMiddleEastService; + private IGlobalTypeService typeService; /** * 查询方法 @@ -29,10 +31,10 @@ public class GlobalTypeController { * @param request * @return */ - @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) - public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST}) + public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request) { - List eastVOSList= australiaMiddleEastService.selectAustralia(); + List eastVOSList= typeService.selectGlobalType(); return AjaxResult.success(eastVOSList); } @@ -41,10 +43,10 @@ public class GlobalTypeController { * @param ID * @return */ - @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST}) - public AjaxResult DelAustralia(@Param("ID") String ID) + @RequestMapping(value = "/DelGlobalType",method = {RequestMethod.POST}) + public AjaxResult DelGlobalType(@Param("ID") String ID) { - int NUM = australiaMiddleEastService.DelAustralia(ID); + int NUM = typeService.DelGlobalType(ID); if (NUM>0) { return AjaxResult.success(); @@ -58,10 +60,10 @@ public class GlobalTypeController { * @param eastVOS * @return */ - @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS) + @RequestMapping(value = "/IntoGlobalType",method = {RequestMethod.POST}) + public AjaxResult IntoGlobalType(GlobalTypeVO eastVOS) { - int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); + int NUM = typeService.IntoGlobalType(eastVOS); if (NUM>0) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java index a49c90257..6b8be70f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java @@ -2,7 +2,9 @@ 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.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -21,7 +23,7 @@ import java.util.List; @RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8") public class OceanTemperatureController { //@Autowired - private IAustraliaMiddleEastService australiaMiddleEastService; + private IOceanTemperatureService temperatureService; /** * 查询方法 @@ -29,10 +31,10 @@ public class OceanTemperatureController { * @param request * @return */ - @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) - public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + @RequestMapping(value = "/selectOcean",method = {RequestMethod.POST}) + public AjaxResult selectOcean(HttpServletResponse response, HttpServletRequest request) { - List eastVOSList= australiaMiddleEastService.selectAustralia(); + List eastVOSList= temperatureService.selectOcean(); return AjaxResult.success(eastVOSList); } @@ -41,10 +43,10 @@ public class OceanTemperatureController { * @param ID * @return */ - @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST}) - public AjaxResult DelAustralia(@Param("ID") String ID) + @RequestMapping(value = "/DelOcean",method = {RequestMethod.POST}) + public AjaxResult DelOcean(@Param("ID") String ID) { - int NUM = australiaMiddleEastService.DelAustralia(ID); + int NUM = temperatureService.DelOcean(ID); if (NUM>0) { return AjaxResult.success(); @@ -59,9 +61,9 @@ public class OceanTemperatureController { * @return */ @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS) + public AjaxResult IntoOcean(OceanTemperatureVO eastVOS) { - int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); + int NUM = temperatureService.IntoOcean(eastVOS); if (NUM>0) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java index b4e368ef1..ab07b1012 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java @@ -2,7 +2,10 @@ 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.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -21,7 +24,7 @@ import java.util.List; @RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8") public class RegionalSystemController { //@Autowired - private IAustraliaMiddleEastService australiaMiddleEastService; + private IRegionalSystemService systemService; /** * 查询方法 @@ -29,10 +32,10 @@ public class RegionalSystemController { * @param request * @return */ - @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) - public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + @RequestMapping(value = "/selectRegional",method = {RequestMethod.POST}) + public AjaxResult selectRegional(HttpServletResponse response, HttpServletRequest request) { - List eastVOSList= australiaMiddleEastService.selectAustralia(); + List eastVOSList= systemService.selectRegional(); return AjaxResult.success(eastVOSList); } @@ -41,10 +44,10 @@ public class RegionalSystemController { * @param ID * @return */ - @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST}) - public AjaxResult DelAustralia(@Param("ID") String ID) + @RequestMapping(value = "/DelRegional",method = {RequestMethod.POST}) + public AjaxResult DelRegional(@Param("ID") String ID) { - int NUM = australiaMiddleEastService.DelAustralia(ID); + int NUM = systemService.DelRegional(ID); if (NUM>0) { return AjaxResult.success(); @@ -58,10 +61,10 @@ public class RegionalSystemController { * @param eastVOS * @return */ - @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS) + @RequestMapping(value = "/IntoRegional",method = {RequestMethod.POST}) + public AjaxResult IntoRegional(RegionalSystemVO eastVOS) { - int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); + int NUM = systemService.IntoRegional(eastVOS); if (NUM>0) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index e37af0c41..b2343fc86 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -2,7 +2,9 @@ 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.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -21,7 +23,7 @@ import java.util.List; @RequestMapping(value = "/business-service/api/Urban", produces = "application/json;charset=UTF-8") public class UrbanController { //@Autowired - private IAustraliaMiddleEastService australiaMiddleEastService; + private IUrbanService urbanService; /** * 查询方法 @@ -29,10 +31,10 @@ public class UrbanController { * @param request * @return */ - @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) - public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + @RequestMapping(value = "/selectUrban",method = {RequestMethod.POST}) + public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request) { - List eastVOSList= australiaMiddleEastService.selectAustralia(); + List eastVOSList= urbanService.selectUrban(); return AjaxResult.success(eastVOSList); } @@ -41,10 +43,10 @@ public class UrbanController { * @param ID * @return */ - @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST}) - public AjaxResult DelAustralia(@Param("ID") String ID) + @RequestMapping(value = "/DelUrban",method = {RequestMethod.POST}) + public AjaxResult DelUrban(@Param("ID") String ID) { - int NUM = australiaMiddleEastService.DelAustralia(ID); + int NUM = urbanService.DelUrban(ID); if (NUM>0) { return AjaxResult.success(); @@ -58,10 +60,10 @@ public class UrbanController { * @param eastVOS * @return */ - @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS) + @RequestMapping(value = "/IntoUrban",method = {RequestMethod.POST}) + public AjaxResult IntoUrban(UrbanVO eastVOS) { - int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); + int NUM = urbanService.IntoUrban(eastVOS); if (NUM>0) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index 9c898ed93..df651c8e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -2,7 +2,9 @@ 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.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -21,7 +23,7 @@ import java.util.List; @RequestMapping(value = "/business-service/api/Vegetation", produces = "application/json;charset=UTF-8") public class VegetationCoverageController { //@Autowired - private IAustraliaMiddleEastService australiaMiddleEastService; + private IVegetationCoverageService coverageService; /** * 查询方法 @@ -29,10 +31,10 @@ public class VegetationCoverageController { * @param request * @return */ - @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) - public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) + @RequestMapping(value = "/selectVegetation",method = {RequestMethod.POST}) + public AjaxResult selectVegetation(HttpServletResponse response, HttpServletRequest request) { - List eastVOSList= australiaMiddleEastService.selectAustralia(); + List eastVOSList= coverageService.selectVegetation(); return AjaxResult.success(eastVOSList); } @@ -41,10 +43,10 @@ public class VegetationCoverageController { * @param ID * @return */ - @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST}) - public AjaxResult DelAustralia(@Param("ID") String ID) + @RequestMapping(value = "/DelVegetation",method = {RequestMethod.POST}) + public AjaxResult DelVegetation(@Param("ID") String ID) { - int NUM = australiaMiddleEastService.DelAustralia(ID); + int NUM = coverageService.DelVegetation(ID); if (NUM>0) { return AjaxResult.success(); @@ -58,10 +60,10 @@ public class VegetationCoverageController { * @param eastVOS * @return */ - @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS) + @RequestMapping(value = "/IntoVegetation",method = {RequestMethod.POST}) + public AjaxResult IntoVegetation(VegetationCoverageVO eastVOS) { - int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); + int NUM = coverageService.IntoVegetation(eastVOS); if (NUM>0) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0bbaeb4f1..eda7f36e9 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -71,7 +71,7 @@ spring: # 数据库索引 database: 3 # 密码 - password: yhy_app + password: sdust2020 # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java index 02fea0533..4129f3b7e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AorestCoverageVO.java @@ -15,13 +15,13 @@ public class AorestCoverageVO extends SysBaseEntity { private String regionEn; - private String protectedLands; + private Double protectedLands; - private String nonProtectedLands; + private Double nonProtectedLands; - private String mountain; + private Double mountain; - private String nonMountain; + private Double nonMountain; public String getId() { return id; @@ -55,35 +55,35 @@ public class AorestCoverageVO extends SysBaseEntity { this.regionEn = regionEn; } - public String getProtectedLands() { + public Double getProtectedLands() { return protectedLands; } - public void setProtectedLands(String protectedLands) { + public void setProtectedLands(Double protectedLands) { this.protectedLands = protectedLands; } - public String getNonProtectedLands() { + public Double getNonProtectedLands() { return nonProtectedLands; } - public void setNonProtectedLands(String nonProtectedLands) { + public void setNonProtectedLands(Double nonProtectedLands) { this.nonProtectedLands = nonProtectedLands; } - public String getMountain() { + public Double getMountain() { return mountain; } - public void setMountain(String mountain) { + public void setMountain(Double mountain) { this.mountain = mountain; } - public String getNonMountain() { + public Double getNonMountain() { return nonMountain; } - public void setNonMountain(String nonMountain) { + public void setNonMountain(Double nonMountain) { this.nonMountain = nonMountain; } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java index 48f77d2fd..87fe6a59d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java @@ -6,7 +6,7 @@ import java.time.LocalDate; * @Author: JinSheng Song * @Date: 2022/5/19 14:50 */ -public class AustraliaMiddleEastVO +public class AustraliaMiddleEastVO extends SysBaseEntity { private String id; @@ -22,8 +22,15 @@ public class AustraliaMiddleEastVO private String createdBy; - private String createdTime; + private LocalDate createdTime; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } public LocalDate getYearMonth() { return yearMonth; @@ -73,19 +80,11 @@ public class AustraliaMiddleEastVO this.createdBy = createdBy; } - public String getCreatedTime() { + public LocalDate getCreatedTime() { return createdTime; } - public void setCreatedTime(String createdTime) { + public void setCreatedTime(LocalDate createdTime) { this.createdTime = createdTime; } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java index 4666755e3..a1c20a217 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java @@ -5,5 +5,65 @@ package com.ruoyi.system.domain_yada; * @Author: JinSheng Song * @Date: 2022/5/20 14:07 */ -public class GlobalTypeVO { +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; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java index 79d7aa622..121f4ac8b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/OceanTemperatureVO.java @@ -1,9 +1,62 @@ package com.ruoyi.system.domain_yada; +import java.time.LocalDate; + /**+ * 海面温度监测 * @Author: JinSheng Song * @Date: 2022/5/20 14:08 */ -public class OceanTemperatureVO { +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; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java index 7f807bbb1..3a36550b4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionalSystemVO.java @@ -6,5 +6,75 @@ package com.ruoyi.system.domain_yada; * @Date: 2022/5/20 14:09 */ -public class RegionalSystemVO { +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; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UrbanVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UrbanVO.java new file mode 100644 index 000000000..04ce9382d --- /dev/null +++ b/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; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java index c0f8daa65..ad01b1bfb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java @@ -1,9 +1,91 @@ package com.ruoyi.system.domain_yada; +import java.time.LocalDate; + /** * 平均植被覆盖度和净初级生产力 * @Author: JinSheng Song * @Date: 2022/5/20 14:09 */ -public class VegetationCoverageVO { +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; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java index ddce23614..0931f079f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java @@ -1,14 +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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectAorestCoverage(); + + Integer DelAorestCoverage(@Param("id") String id); + + Integer IntoAorestCoverage(AorestCoverageVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java index ca10f21a6..c6d93ba6c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java @@ -1,14 +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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectGlobalType(); + + Integer DelGlobalType(@Param("id") String id); + + Integer IntoGlobalType(GlobalTypeVO typeVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java index ff5594d07..9b7a33567 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java @@ -1,14 +1,20 @@ package com.ruoyi.system.mapper_yada; +import com.ruoyi.system.domain_yada.OceanTemperatureVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + /** * @Author: JinSheng Song * @Date: 2022/5/11 15:18 */ public interface OceanTemperatureMapper { -// List selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectOcean(); + + Integer DelOcean(@Param("id") String id); + + Integer IntoOcean(OceanTemperatureVO eastVO); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java index 9fde98f60..6f7a342d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/RegionalSystemMapper.java @@ -1,14 +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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectRegional(); + + Integer DelRegional(@Param("id") String id); + + Integer IntoRegional(RegionalSystemVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java index a3e80c76c..eb3e201d6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/UrbanMapper.java @@ -1,8 +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 selectUrban(); + + Integer DelUrban(@Param("id") String id); + + Integer IntoUrban(UrbanVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java index 977c0d111..1b34d8d5b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/VegetationCoverageMapper.java @@ -1,14 +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 selectAustralia(); -// -// Integer DelAustralia(@Param("id") String id); -// -// Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + List selectVegetation(); + + Integer DelVegetation(@Param("id") String id); + + Integer IntoVegetation(VegetationCoverageVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java index b43289501..938d9b3bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java @@ -1,5 +1,6 @@ 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; @@ -12,9 +13,9 @@ import java.util.List; */ public interface IAorestCoverageService { - public List selectAustralia(); + public List selectAorestCoverage(); - public Integer DelAustralia(@Param("id") String id); + public Integer DelAorestCoverage(@Param("id") String id); - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + public Integer IntoAorestCoverage(AorestCoverageVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java index 3d9787e52..e09d8a5d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java @@ -1,6 +1,7 @@ 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; @@ -12,9 +13,9 @@ import java.util.List; */ public interface IGlobalTypeService { - public List selectAustralia(); + public List selectGlobalType(); - public Integer DelAustralia(@Param("id") String id); + public Integer DelGlobalType(String id); - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + public Integer IntoGlobalType(GlobalTypeVO typeVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java index ce17df7ef..7191272d1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IOceanTemperatureService.java @@ -1,6 +1,7 @@ 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; @@ -12,9 +13,9 @@ import java.util.List; */ public interface IOceanTemperatureService { - public List selectAustralia(); + public List selectOcean(); - public Integer DelAustralia(@Param("id") String id); + public Integer DelOcean(@Param("id") String id); - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + public Integer IntoOcean(OceanTemperatureVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java index 9a7126571..77a381a51 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IRegionalSystemService.java @@ -1,6 +1,7 @@ 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; @@ -12,9 +13,9 @@ import java.util.List; */ public interface IRegionalSystemService { - public List selectAustralia(); + public List selectRegional(); - public Integer DelAustralia(@Param("id") String id); + public Integer DelRegional(@Param("id") String id); - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + public Integer IntoRegional(RegionalSystemVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java index 06bff3eb0..1955c293f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IUrbanService.java @@ -1,9 +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 selectUrban(); + + public Integer DelUrban(@Param("id") String id); + + public Integer IntoUrban(UrbanVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java index be6e70782..350d0093e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IVegetationCoverageService.java @@ -1,6 +1,7 @@ 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; @@ -12,9 +13,9 @@ import java.util.List; */ public interface IVegetationCoverageService { - public List selectAustralia(); + public List selectVegetation(); - public Integer DelAustralia(@Param("id") String id); + public Integer DelVegetation(String id); - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO); + public Integer IntoVegetation(VegetationCoverageVO eastVO); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index 007d88880..c1bb6a3c5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -1,6 +1,8 @@ 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; @@ -14,22 +16,21 @@ import java.util.List; */ public class AorestCoverageServiceimpl implements IAorestCoverageService { @Autowired - private AustraliaMiddleEastMapper australiaMiddleEastMapper; + private AorestCoverageMapper coverageMapper; + @Override - public List selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List selectAorestCoverage() { + return coverageMapper.selectAorestCoverage(); } @Override - public Integer DelAustralia(String id) { - return australiaMiddleEastMapper.DelAustralia(id); - + public Integer DelAorestCoverage(String id) { + return coverageMapper.DelAorestCoverage(id); } @Override - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { - return australiaMiddleEastMapper.IntoAustralia(eastVO); + public Integer IntoAorestCoverage(AorestCoverageVO eastVO) { + return IntoAorestCoverage(eastVO); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java index 905344219..dbf2d9560 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java @@ -1,7 +1,9 @@ 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; @@ -15,22 +17,21 @@ import java.util.List; public class GlobalTypeServiceimpl implements IGlobalTypeService { @Autowired - private AustraliaMiddleEastMapper australiaMiddleEastMapper; + private GlobalTypeMapper typeMapper; + @Override - public List selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List selectGlobalType() { + return typeMapper.selectGlobalType(); } @Override - public Integer DelAustralia(String id) { - return australiaMiddleEastMapper.DelAustralia(id); - + public Integer DelGlobalType(String id) { + return typeMapper.DelGlobalType(id); } @Override - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { - return australiaMiddleEastMapper.IntoAustralia(eastVO); + public Integer IntoGlobalType(GlobalTypeVO typeVO) { + return typeMapper.IntoGlobalType(typeVO); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java index 5f80f27be..cf4208b05 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java @@ -1,7 +1,9 @@ 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; @@ -15,22 +17,21 @@ import java.util.List; public class OceanTemperatureServiceimpl implements IOceanTemperatureService { @Autowired - private AustraliaMiddleEastMapper australiaMiddleEastMapper; + private OceanTemperatureMapper oceanMapper; + @Override - public List selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List selectOcean() { + return oceanMapper.selectOcean(); } @Override - public Integer DelAustralia(String id) { - return australiaMiddleEastMapper.DelAustralia(id); - + public Integer DelOcean(String id) { + return oceanMapper.DelOcean(id); } @Override - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { - return australiaMiddleEastMapper.IntoAustralia(eastVO); + public Integer IntoOcean(OceanTemperatureVO eastVO) { + return oceanMapper.IntoOcean(eastVO); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java index 08933a0ac..a34d7561e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java @@ -1,7 +1,9 @@ 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; @@ -15,22 +17,22 @@ import java.util.List; public class RegionalSystemServiceimpl implements IRegionalSystemService { @Autowired - private AustraliaMiddleEastMapper australiaMiddleEastMapper; + private RegionalSystemMapper Regional; + @Override - public List selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List selectRegional() { + return Regional.selectRegional(); } @Override - public Integer DelAustralia(String id) { - return australiaMiddleEastMapper.DelAustralia(id); - + public Integer DelRegional(String id) { + return Regional.DelRegional(id); } @Override - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { - return australiaMiddleEastMapper.IntoAustralia(eastVO); + public Integer IntoRegional(RegionalSystemVO eastVO) { + return Regional.IntoRegional(eastVO); } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java index d5c77966d..134982bfb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java @@ -1,6 +1,12 @@ 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 java.util.List; /** * * 城市监测 @@ -8,4 +14,23 @@ import com.ruoyi.system.service_yada.IUrbanService; * @Date: 2022/5/11 11:49 */ public class UrbanServiceimpl implements IUrbanService { + + @Autowired + private UrbanMapper urbanMapper; + + @Override + + public List selectUrban() { + return urbanMapper.selectUrban(); + } + + @Override + public Integer DelUrban(String id) { + return urbanMapper.DelUrban(id); + } + + @Override + public Integer IntoUrban(UrbanVO eastVO) { + return urbanMapper.IntoUrban(eastVO); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java index 62b71f4ae..897971389 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java @@ -1,7 +1,9 @@ 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; @@ -16,22 +18,21 @@ public class VegetationCoverageServiceimpl implements IVegetationCoverageService @Autowired - private AustraliaMiddleEastMapper australiaMiddleEastMapper; + private VegetationCoverageMapper coverageMapper; + @Override - public List selectAustralia() - { - return australiaMiddleEastMapper.selectAustralia(); + public List selectVegetation() { + return coverageMapper.selectVegetation(); } @Override - public Integer DelAustralia(String id) { - return australiaMiddleEastMapper.DelAustralia(id); - + public Integer DelVegetation(String id) { + return coverageMapper.DelVegetation(id); } @Override - public Integer IntoAustralia(AustraliaMiddleEastVO eastVO) { - return australiaMiddleEastMapper.IntoAustralia(eastVO); + public Integer IntoVegetation(VegetationCoverageVO eastVO) { + return coverageMapper.IntoVegetation(eastVO); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index 2f5f8d371..3250666ff 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -4,5 +4,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + + + + DELETE FROM forest_coverage + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index 83a9015e8..731b4a8e8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml @@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{precipitationAnomolies,jdbcType=DOUBLE}, #{vaiAnomolies,jdbcType=DOUBLE}, #{createdBy,jdbcType=VARCHAR}, - #{createdTime,jdbcType=VARCHAR} + #{createdTime,jdbcType=DATE} ) ]]> diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml index 1c423e4d2..314d8ebae 100644 --- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml @@ -4,4 +4,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + + DELETE FROM proportion_of_global_types + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml index 588e289d3..ddd304cf8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml @@ -4,5 +4,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + DELETE FROM sea_surface_temperature_anomaly + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml index e1db72f9d..cf99c5370 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml @@ -4,5 +4,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + + DELETE FROM proportion_of_ecosystem_type_transfer + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml index 45ba48a7d..779198a65 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml @@ -4,5 +4,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + DELETE FROM urban_agglomeration_china + WHERE ID=#{id} + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml index da8ae0ab5..24e0e6b33 100644 --- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml @@ -3,6 +3,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + + + + + + + DELETE FROM fvc_npp + WHERE ID=#{id} + + + + + \ No newline at end of file From f4caf10bd3b2ffb1ef4bcaed0c56f187ed16f2bc Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Mon, 23 May 2022 09:49:01 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/RuoYiApplication.java | 2 - .../src/main/resources/application.yml | 7 +-- ruoyi-admin/src/main/resources/banner.txt | 48 +++++++--------- .../system/domain_yada/SysBaseEntity.java | 56 ++++++++++--------- ruoyi-ui/.env.development | 22 ++++---- 5 files changed, 64 insertions(+), 71 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 01606a4d8..9639bc9c3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -1,6 +1,5 @@ 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,7 +9,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * * @author ruoyi */ -@MapperScan("com.ruoyi.system.mapper_yada") @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) public class RuoYiApplication { diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index a65a211fe..eda7f36e9 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -18,7 +18,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 9900 + port: 8080 servlet: # 应用的访问路径 context-path: / @@ -97,9 +97,9 @@ token: # MyBatis配置 mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada + typeAliasesPackage: com.ruoyi.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml + mapperLocations: classpath*:mapper/**/*Mapper.xml # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml @@ -116,7 +116,6 @@ swagger: # 请求前缀 pathMapping: /dev-api - # 防止XSS攻击 xss: # 过滤开关 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index 8e65fd3ab..a02645ec3 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -1,34 +1,24 @@ Application Version: ${ruoyi.version} Spring Boot Version: ${spring-boot.version} //////////////////////////////////////////////////////////////////// - /\ - | | - | | - .' '. - | | - | | - | /\ | - .' |__|'. - | | | | - .' | | '. - /\ | \__/ | /\ - | | | | | | | | - /| | |,-\ | | /-,| | |\ - || |,-' | | | | '-,| || - ||-' | | | | '-|| -|\ _,-' | | | | '-,_ /| -|| ,-' _ | | | | '-, || -||-' =(*)= | | | | '-|| -|| | \ / | || -|\________....--------\ || /--------....________/| - /| || |\ - / | || | \ - / | \/ | \ - / | | \ - // .| |. \\ - .' |_./ | | \._| '. - / _.-||| |||-._ \ - \__.-' \||/\||/ '-.__/ +// _ooOoo_ // +// o6666666o // +// 88" . "88 // +// (| ^_^ |) // +// O\ = /O // +// ____/`---'\____ // +// .' \\| |// `. // +// / \\||| : |||// \ // +// / _||||| -:- |||||- \ // +// | | \\\ - /// | | // +// | \_| ''\---/'' | | // +// \ .-\__ `-` ___/-. / // +// ___`. .' /--.--\ `. . ___ // +// ."" '< `.___\_<|>_/___.' >'"". // +// | | : `- \`.;`\ _ /`;.`/ - ` : | | // +// \ \ `-. \_ __\ /__ _/ .-` / / // +// ========`-.____`-.___\_____/___.-`____.-'======== // +// `=---=' // // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 飞机保佑 永不宕机 永无BUG // +// 佛祖保佑 永不宕机 永无BUG // //////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java index 527685c9c..bdef7faee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SysBaseEntity.java @@ -15,61 +15,67 @@ public class SysBaseEntity implements Serializable private static final long serialVersionUID = 1L; /** 创建者 */ - private String createdBy; + private String createBy; /** 创建时间 */ - private LocalDateTime createdTime; + private LocalDateTime createTime; /** 更新者 */ - private String updatedBy; + private String updateBy; /** 更新时间 */ - private LocalDateTime updatedTime; + private LocalDateTime updateTime; /** 备注 */ - private String remarks; + private String remark; /** 请求参数 */ private Map params; - public String getCreatedBy() { - return createdBy; + public String getCreateBy() + { + return createBy; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; + public void setCreateBy(String createBy) + { + this.createBy = createBy; } - public LocalDateTime getCreatedTime() { - return createdTime; + public LocalDateTime getCreateTime() { + return createTime; } - public void setCreatedTime(LocalDateTime createdTime) { - this.createdTime = createdTime; + public void setCreateTime(LocalDateTime createTime) { + this.createTime = createTime; } - public String getUpdatedBy() { - return updatedBy; + public String getUpdateBy() + { + return updateBy; } - public void setUpdatedBy(String updatedBy) { - this.updatedBy = updatedBy; + public void setUpdateBy(String updateBy) + { + this.updateBy = updateBy; } - public LocalDateTime getUpdatedTime() { - return updatedTime; + public LocalDateTime getUpdateTime() { + return updateTime; } - public void setUpdatedTime(LocalDateTime updatedTime) { - this.updatedTime = updatedTime; + public void setUpdateTime(LocalDateTime updateTime) { + this.updateTime = updateTime; } - public String getRemarks() { - return remarks; + public String getRemark() + { + return remark; } - public void setRemarks(String remarks) { - this.remarks = remarks; + public void setRemark(String remark) + { + this.remark = remark; } public Map getParams() diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 6f3363e21..302ecd1ab 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,11 +1,11 @@ -# 页面标题 -VUE_APP_TITLE = 若依管理系统 - -# 开发环境配置 -ENV = 'development' - -# 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.2.105:9900' - -# 路由懒加载 -VUE_CLI_BABEL_TRANSPILE_MODULES = true +# 页面标题 +VUE_APP_TITLE = 若依管理系统 + +# 开发环境配置 +ENV = 'development' + +# 若依管理系统/开发环境 +VUE_APP_BASE_API = '/dev-api' + +# 路由懒加载 +VUE_CLI_BABEL_TRANSPILE_MODULES = true From 5041f3f92f8e9599661b1a5a5fea0032355755ed Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Mon, 23 May 2022 14:17:46 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/RuoYiApplication.java | 2 ++ .../controller/yada/AorestCoverageController.java | 4 +++- .../yada/AustraliaMiddleEastController.java | 4 +++- .../web/controller/yada/GlobalTypeController.java | 4 +++- .../controller/yada/OceanTemperatureController.java | 4 +++- .../web/controller/yada/RegionVGIController.java | 4 +++- .../controller/yada/RegionalSystemController.java | 4 +++- .../ruoyi/web/controller/yada/UrbanController.java | 4 +++- .../yada/VegetationCoverageController.java | 4 +++- ruoyi-admin/src/main/resources/application-druid.yml | 2 +- ruoyi-admin/src/main/resources/application.yml | 5 +++-- .../ruoyi/system/domain_yada/ThematicMapDomain.java | 12 ++++++------ .../system/mapper_yada/OceanTemperatureMapper.java | 2 ++ .../service_yada/impl/AorestCoverageServiceimpl.java | 5 ++++- .../impl/AustraliaMiddleEastServiceimpl.java | 5 ++++- .../service_yada/impl/GlobalTypeServiceimpl.java | 5 ++++- .../impl/OceanTemperatureServiceimpl.java | 5 ++++- .../service_yada/impl/RegionVGIServiceimpl.java | 5 ++++- .../service_yada/impl/RegionalSystemServiceimpl.java | 5 ++++- .../system/service_yada/impl/UrbanServiceimpl.java | 5 ++++- .../impl/VegetationCoverageServiceimpl.java | 5 ++++- 21 files changed, 70 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 9639bc9c3..7ecbd0496 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/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,6 +11,7 @@ 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) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index e805a6d1b..f4aae863e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -6,10 +6,12 @@ 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; @@ -22,7 +24,7 @@ import java.util.List; @RestController @RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8") public class AorestCoverageController { - //@Autowired + @Resource private IAorestCoverageService service; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index b5a34ba35..529e126d2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -4,10 +4,12 @@ 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; @@ -21,7 +23,7 @@ import java.util.List; @RequestMapping(value = "/business-service/api/Australia", produces = "application/json;charset=UTF-8") public class AustraliaMiddleEastController { - //@Autowired + @Resource private IAustraliaMiddleEastService australiaMiddleEastService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java index 13412d4f1..83fc2352e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java @@ -6,10 +6,12 @@ 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; @@ -22,7 +24,7 @@ import java.util.List; @RestController @RequestMapping("/monitor/clobal") public class GlobalTypeController { - //@Autowired + @Resource private IGlobalTypeService typeService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java index 6b8be70f7..babc6a7a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java @@ -6,10 +6,12 @@ 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; @@ -22,7 +24,7 @@ import java.util.List; @RestController @RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8") public class OceanTemperatureController { - //@Autowired + @Resource private IOceanTemperatureService temperatureService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java index 0c5dfd53d..c3d33f510 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java @@ -4,11 +4,13 @@ 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; @@ -22,7 +24,7 @@ import java.util.List; @RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8") public class RegionVGIController { - //@Autowired + @Resource private IRegionVGIService regionVGIService; /** * 查询方法 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java index ab07b1012..cf6d76bc8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java @@ -7,10 +7,12 @@ 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; @@ -23,7 +25,7 @@ import java.util.List; @RestController @RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8") public class RegionalSystemController { - //@Autowired + @Resource private IRegionalSystemService systemService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index b2343fc86..612557f9b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -6,10 +6,12 @@ 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; @@ -22,7 +24,7 @@ import java.util.List; @RestController @RequestMapping(value = "/business-service/api/Urban", produces = "application/json;charset=UTF-8") public class UrbanController { - //@Autowired + @Resource private IUrbanService urbanService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index df651c8e5..c822ad905 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -6,10 +6,12 @@ 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; @@ -22,7 +24,7 @@ import java.util.List; @RestController @RequestMapping(value = "/business-service/api/Vegetation", produces = "application/json;charset=UTF-8") public class VegetationCoverageController { - //@Autowired + @Resource private IVegetationCoverageService coverageService; /** diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 44ae6554a..9bff4eb18 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.2.9:3306/nuoyi?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: saas password: XKrs123. # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index eda7f36e9..da6fb4a28 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -97,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 @@ -116,6 +116,7 @@ swagger: # 请求前缀 pathMapping: /dev-api + # 防止XSS攻击 xss: # 过滤开关 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java index 49908b895..949c3d0be 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java @@ -85,32 +85,32 @@ public class ThematicMapDomain extends SysBaseEntity { this.picturePath = picturePath; } - @Override + public String getRemarks() { return remarks; } - @Override + public void setRemarks(String remarks) { this.remarks = remarks; } - @Override + public String getCreatedBy() { return createdBy; } - @Override + public void setCreatedBy(String createdBy) { this.createdBy = createdBy; } - @Override + public LocalDateTime getCreatedTime() { return createdTime; } - @Override + public void setCreatedTime(LocalDateTime createdTime) { this.createdTime = createdTime; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java index 9b7a33567..4b2c6a0a7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/OceanTemperatureMapper.java @@ -2,6 +2,7 @@ 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; @@ -9,6 +10,7 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 15:18 */ +@Repository public interface OceanTemperatureMapper { List selectOcean(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index c1bb6a3c5..223f89e3b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -6,7 +6,9 @@ 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; /** @@ -14,8 +16,9 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 11:43 */ +@Service public class AorestCoverageServiceimpl implements IAorestCoverageService { - @Autowired + @Resource private AorestCoverageMapper coverageMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java index 69eaec77d..d4ebed9a9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java @@ -4,7 +4,9 @@ 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; /** @@ -12,9 +14,10 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 11:43 */ +@Service public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastService { - @Autowired + @Resource private AustraliaMiddleEastMapper australiaMiddleEastMapper; @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java index dbf2d9560..1f3f7d3b6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java @@ -6,7 +6,9 @@ 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; /** @@ -14,9 +16,10 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 11:47 */ +@Service public class GlobalTypeServiceimpl implements IGlobalTypeService { - @Autowired + @Resource private GlobalTypeMapper typeMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java index cf4208b05..ef5e0f0b8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java @@ -6,7 +6,9 @@ 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; /** @@ -14,9 +16,10 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 11:47 */ +@Service public class OceanTemperatureServiceimpl implements IOceanTemperatureService { - @Autowired + @Resource private OceanTemperatureMapper oceanMapper; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java index 7218cb98b..5cdd97392 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java @@ -4,7 +4,9 @@ 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; /** @@ -12,9 +14,10 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 11:45 */ +@Service public class RegionVGIServiceimpl implements IRegionVGIService { - @Autowired + @Resource private RegionVGIMapper vgiMapper; @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java index a34d7561e..72121682b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java @@ -6,7 +6,9 @@ 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; /** @@ -14,9 +16,10 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 11:46 */ +@Service public class RegionalSystemServiceimpl implements IRegionalSystemService { - @Autowired + @Resource private RegionalSystemMapper Regional; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java index 134982bfb..bc536d5b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java @@ -5,7 +5,9 @@ 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; /** @@ -13,9 +15,10 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 11:49 */ +@Service public class UrbanServiceimpl implements IUrbanService { - @Autowired + @Resource private UrbanMapper urbanMapper; @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java index 897971389..d578a5bf3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java @@ -6,7 +6,9 @@ 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; /** @@ -14,10 +16,11 @@ import java.util.List; * @Author: JinSheng Song * @Date: 2022/5/11 11:45 */ +@Service public class VegetationCoverageServiceimpl implements IVegetationCoverageService { - @Autowired + @Resource private VegetationCoverageMapper coverageMapper; From 9b784c99ed0f2926358cba1737bb346de5d492c7 Mon Sep 17 00:00:00 2001 From: qdxkrs <39894542+qdxkrs@users.noreply.github.com> Date: Mon, 23 May 2022 14:36:19 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 2 ++ .../com/ruoyi/system/domain_yada/ThematicMapDomain.java | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 9639bc9c3..7ecbd0496 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/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,6 +11,7 @@ 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) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java index 49908b895..39fc939e4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java @@ -85,32 +85,26 @@ public class ThematicMapDomain extends SysBaseEntity { this.picturePath = picturePath; } - @Override public String getRemarks() { return remarks; } - @Override public void setRemarks(String remarks) { this.remarks = remarks; } - @Override public String getCreatedBy() { return createdBy; } - @Override public void setCreatedBy(String createdBy) { this.createdBy = createdBy; } - @Override public LocalDateTime getCreatedTime() { return createdTime; } - @Override public void setCreatedTime(LocalDateTime createdTime) { this.createdTime = createdTime; } From 15bc756bd4502b72b81a345e718d5964fdc811be Mon Sep 17 00:00:00 2001 From: qdxkrs <39894542+qdxkrs@users.noreply.github.com> Date: Mon, 23 May 2022 14:38:09 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain_yada/ThematicMapDomain.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java index c9b54a0c4..39fc939e4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java @@ -89,41 +89,22 @@ public class ThematicMapDomain extends SysBaseEntity { 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; } From 264a5d910f054a6c4c87c69800b8249e47089350 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Tue, 24 May 2022 11:29:11 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yada/AorestCoverageController.java | 40 ++++++++++++------- .../yada/AustraliaMiddleEastController.java | 21 +++++----- .../controller/yada/GlobalTypeController.java | 21 +++++----- .../yada/OceanTemperatureController.java | 21 +++++----- .../controller/yada/RegionVGIController.java | 21 +++++----- .../yada/RegionalSystemController.java | 21 +++++----- .../yada/SpecialReportController.java | 2 - .../yada/ThematicMapController.java | 21 +++++----- .../web/controller/yada/UrbanController.java | 21 +++++----- .../yada/VegetationCoverageController.java | 21 +++++----- .../domain_yada/AustraliaMiddleEastVO.java | 19 --------- .../ruoyi/system/domain_yada/RegionVGIVO.java | 7 ++-- .../impl/AorestCoverageServiceimpl.java | 2 +- .../mapper/system/AorestCoverageMapper.xml | 8 ++-- .../system/AustraliaMiddleEastMapper.xml | 16 ++++---- 15 files changed, 130 insertions(+), 132 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index f4aae863e..a998f9f39 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -7,6 +7,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -14,12 +15,13 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.xml.crypto.Data; +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; 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") @@ -29,9 +31,9 @@ public class AorestCoverageController { /** * 查询方法 - * @param response - * @param request - * @return + * @param response 响应头 + * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.POST}) public AjaxResult selectAorestCoverage(HttpServletResponse response, HttpServletRequest request) @@ -42,8 +44,8 @@ public class AorestCoverageController { /** * 删除方法 - * @param ID - * @return + * @param ID 单据id + * @return 状态码 */ @RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.POST}) public AjaxResult DelAorestCoverage(@Param("ID") String ID) @@ -59,17 +61,25 @@ public class AorestCoverageController { /** * 新增方法 - * @param eastVOS - * @return + * @param eastVOS 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/IntoAorestCoverage",method = {RequestMethod.POST}) - public AjaxResult IntoAorestCoverage(AorestCoverageVO eastVOS) + public AjaxResult IntoAorestCoverage(@RequestBody AorestCoverageVO eastVOS) { - int NUM = service.IntoAorestCoverage(eastVOS); - if (NUM>0) - { - return AjaxResult.success(); + try { + eastVOS.setCreateTime(LocalDateTime.now()); + int NUM = service.IntoAorestCoverage(eastVOS); + if (NUM>0) + { + return AjaxResult.success(); + } + return AjaxResult.error(); } - return AjaxResult.error(); + catch (Exception E){ + E.getMessage(); + return AjaxResult.error(); + } + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index 529e126d2..c02ec3642 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -5,6 +5,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -12,12 +13,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; 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") @@ -28,9 +28,9 @@ public class AustraliaMiddleEastController /** * 查询方法 - * @param response - * @param request - * @return + * @param response 请求头 + * @param request 客户端请求 + * @return 实体类 */ @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) @@ -41,8 +41,8 @@ public class AustraliaMiddleEastController /** * 删除方法 - * @param ID - * @return + * @param ID 单据id + * @return 状态码 */ @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST}) public AjaxResult DelAustralia(@Param("ID") String ID) @@ -58,12 +58,13 @@ public class AustraliaMiddleEastController /** * 新增方法 - * @param eastVOS - * @return + * @param eastVOS 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoAustralia(AustraliaMiddleEastVO eastVOS) + public AjaxResult IntoAustralia(@RequestBody AustraliaMiddleEastVO eastVOS) { + eastVOS.setCreateTime(LocalDateTime.now()); int NUM = australiaMiddleEastService.IntoAustralia(eastVOS); if (NUM>0) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java index 83fc2352e..860257f25 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java @@ -7,6 +7,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -14,12 +15,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; import java.util.List; /** *全球各类型占比 - * @Author: JinSheng Song - * @Date: 2022/5/11 9:05 */ @RestController @RequestMapping("/monitor/clobal") @@ -29,9 +29,9 @@ public class GlobalTypeController { /** * 查询方法 - * @param response - * @param request - * @return + * @param response 响应头 + * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST}) public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request) @@ -42,8 +42,8 @@ public class GlobalTypeController { /** * 删除方法 - * @param ID - * @return + * @param ID 单据id + * @return 状态码 */ @RequestMapping(value = "/DelGlobalType",method = {RequestMethod.POST}) public AjaxResult DelGlobalType(@Param("ID") String ID) @@ -59,12 +59,13 @@ public class GlobalTypeController { /** * 新增方法 - * @param eastVOS - * @return + * @param eastVOS 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/IntoGlobalType",method = {RequestMethod.POST}) - public AjaxResult IntoGlobalType(GlobalTypeVO eastVOS) + public AjaxResult IntoGlobalType(@RequestBody GlobalTypeVO eastVOS) { + eastVOS.setCreateTime(LocalDateTime.now()); int NUM = typeService.IntoGlobalType(eastVOS); if (NUM>0) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java index babc6a7a3..84447d796 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java @@ -7,6 +7,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -14,12 +15,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; 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") @@ -29,9 +29,9 @@ public class OceanTemperatureController { /** * 查询方法 - * @param response - * @param request - * @return + * @param response 响应头 + * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/selectOcean",method = {RequestMethod.POST}) public AjaxResult selectOcean(HttpServletResponse response, HttpServletRequest request) @@ -42,8 +42,8 @@ public class OceanTemperatureController { /** * 删除方法 - * @param ID - * @return + * @param ID 单据id + * @return 状态码 */ @RequestMapping(value = "/DelOcean",method = {RequestMethod.POST}) public AjaxResult DelOcean(@Param("ID") String ID) @@ -59,12 +59,13 @@ public class OceanTemperatureController { /** * 新增方法 - * @param eastVOS - * @return + * @param eastVOS 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) - public AjaxResult IntoOcean(OceanTemperatureVO eastVOS) + public AjaxResult IntoOcean(@RequestBody OceanTemperatureVO eastVOS) { + eastVOS.setCreateTime(LocalDateTime.now()); int NUM = temperatureService.IntoOcean(eastVOS); if (NUM>0) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java index c3d33f510..20c4fa56e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java @@ -5,6 +5,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -13,12 +14,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; 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") @@ -28,9 +28,9 @@ public class RegionVGIController private IRegionVGIService regionVGIService; /** * 查询方法 - * @param response - * @param request - * @return + * @param response 响应头 + * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/SelectRegion",method = {RequestMethod.POST}) public AjaxResult SelectRegion(HttpServletResponse response, HttpServletRequest request) @@ -41,8 +41,8 @@ public class RegionVGIController /** * 删除方法 - * @param ID - * @return + * @param ID 单据id + * @return 状态码 */ @RequestMapping(value = "/DelRegion",method = {RequestMethod.POST}) public AjaxResult DelRegion(@Param("ID") String ID) @@ -58,12 +58,13 @@ public class RegionVGIController /** * 新增方法 - * @param vgivo - * @return + * @param vgivo 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/IntoRegion",method = {RequestMethod.POST}) - public AjaxResult IntoRegion(RegionVGIVO vgivo) + public AjaxResult IntoRegion(@RequestBody RegionVGIVO vgivo) { + vgivo.setCreatedTime(LocalDateTime.now()); int NUM = regionVGIService.IntoRegion(vgivo); if (NUM>0) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java index cf6d76bc8..2e0dd5044 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java @@ -8,6 +8,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -15,12 +16,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; 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") @@ -30,9 +30,9 @@ public class RegionalSystemController { /** * 查询方法 - * @param response - * @param request - * @return + * @param response 响应头 + * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/selectRegional",method = {RequestMethod.POST}) public AjaxResult selectRegional(HttpServletResponse response, HttpServletRequest request) @@ -43,8 +43,8 @@ public class RegionalSystemController { /** * 删除方法 - * @param ID - * @return + * @param ID 单据id + * @return 状态码 */ @RequestMapping(value = "/DelRegional",method = {RequestMethod.POST}) public AjaxResult DelRegional(@Param("ID") String ID) @@ -60,12 +60,13 @@ public class RegionalSystemController { /** * 新增方法 - * @param eastVOS - * @return + * @param eastVOS 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/IntoRegional",method = {RequestMethod.POST}) - public AjaxResult IntoRegional(RegionalSystemVO eastVOS) + public AjaxResult IntoRegional(@RequestBody RegionalSystemVO eastVOS) { + eastVOS.setCreateTime(LocalDateTime.now()); int NUM = systemService.IntoRegional(eastVOS); if (NUM>0) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java index 7953a60b2..51c3468b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java @@ -2,8 +2,6 @@ package com.ruoyi.web.controller.yada; /** * 专题报告 - * @Author: JinSheng Song - * @Date: 2022/5/11 11:10 */ public class SpecialReportController { } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java index 3b01a3023..ad0e78381 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java @@ -4,6 +4,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -11,12 +12,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; import java.util.List; /** * 中国城市监测 - * @Author: JinSheng Song - * @Date: 2022/5/11 10:55 */ @RestController @RequestMapping(value = "/thematic-map") @@ -27,9 +27,9 @@ public class ThematicMapController { /** * 查询方法 - * @param response - * @param request - * @return + * @param response 响应头 + * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/get/all",method = {RequestMethod.GET}) public AjaxResult selectAllThematicMap(HttpServletResponse response, HttpServletRequest request) @@ -40,8 +40,8 @@ public class ThematicMapController { /** * 删除方法 - * @param id - * @return + * @param id 单据id + * @return 状态码 */ @RequestMapping(value = "/delete",method = {RequestMethod.DELETE}) public AjaxResult deleteThematicMap(@Param("id") Long id) @@ -55,12 +55,13 @@ public class ThematicMapController { /** * 新增方法 - * @param thematicMapDomain - * @return + * @param thematicMapDomain 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/add",method = {RequestMethod.POST}) - public AjaxResult saveThematicMap(ThematicMapDomain thematicMapDomain) + public AjaxResult saveThematicMap(@RequestBody ThematicMapDomain thematicMapDomain) { + thematicMapDomain.setCreatedTime(LocalDateTime.now()); int num = thematicMapService.save(thematicMapDomain); if (num>0) { return AjaxResult.success(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index 612557f9b..129f2ff55 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -7,6 +7,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -14,12 +15,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; 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") @@ -29,9 +29,9 @@ public class UrbanController { /** * 查询方法 - * @param response - * @param request - * @return + * @param response 响应头 + * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/selectUrban",method = {RequestMethod.POST}) public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request) @@ -42,8 +42,8 @@ public class UrbanController { /** * 删除方法 - * @param ID - * @return + * @param ID 单据id + * @return 状态码 */ @RequestMapping(value = "/DelUrban",method = {RequestMethod.POST}) public AjaxResult DelUrban(@Param("ID") String ID) @@ -59,12 +59,13 @@ public class UrbanController { /** * 新增方法 - * @param eastVOS - * @return + * @param eastVOS 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/IntoUrban",method = {RequestMethod.POST}) - public AjaxResult IntoUrban(UrbanVO eastVOS) + public AjaxResult IntoUrban(@RequestBody UrbanVO eastVOS) { + eastVOS.setCreateTime(LocalDateTime.now()); int NUM = urbanService.IntoUrban(eastVOS); if (NUM>0) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index c822ad905..7d7db94d9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -7,6 +7,7 @@ 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.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -14,12 +15,11 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; 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") @@ -29,9 +29,9 @@ public class VegetationCoverageController { /** * 查询方法 - * @param response - * @param request - * @return + * @param response 响应头 + * @param request 客户端请求 + * @return 参数类 */ @RequestMapping(value = "/selectVegetation",method = {RequestMethod.POST}) public AjaxResult selectVegetation(HttpServletResponse response, HttpServletRequest request) @@ -42,8 +42,8 @@ public class VegetationCoverageController { /** * 删除方法 - * @param ID - * @return + * @param ID 单据id + * @return 状态码 */ @RequestMapping(value = "/DelVegetation",method = {RequestMethod.POST}) public AjaxResult DelVegetation(@Param("ID") String ID) @@ -59,12 +59,13 @@ public class VegetationCoverageController { /** * 新增方法 - * @param eastVOS - * @return + * @param eastVOS 新增实体类 + * @return 状态码 */ @RequestMapping(value = "/IntoVegetation",method = {RequestMethod.POST}) - public AjaxResult IntoVegetation(VegetationCoverageVO eastVOS) + public AjaxResult IntoVegetation(@RequestBody VegetationCoverageVO eastVOS) { + eastVOS.setCreateTime(LocalDateTime.now()); int NUM = coverageService.IntoVegetation(eastVOS); if (NUM>0) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java index 87fe6a59d..e6e977f40 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java @@ -20,10 +20,6 @@ public class AustraliaMiddleEastVO extends SysBaseEntity private Double vaiAnomolies; - private String createdBy; - - private LocalDate createdTime; - public String getId() { return id; } @@ -72,19 +68,4 @@ public class AustraliaMiddleEastVO extends SysBaseEntity 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; - } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java index 49bb6f307..c46577ce9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java @@ -2,6 +2,7 @@ package com.ruoyi.system.domain_yada; import java.io.Serializable; import java.time.LocalDate; +import java.time.LocalDateTime; /** * @Author: JinSheng Song @@ -26,7 +27,7 @@ public class RegionVGIVO implements Serializable { private String createdBy; - private LocalDate createdTime; + private LocalDateTime createdTime; public String getId() { return id; @@ -100,11 +101,11 @@ public class RegionVGIVO implements Serializable { this.createdBy = createdBy; } - public LocalDate getCreatedTime() { + public LocalDateTime getCreatedTime() { return createdTime; } - public void setCreatedTime(LocalDate createdTime) { + public void setCreatedTime(LocalDateTime createdTime) { this.createdTime = createdTime; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index 223f89e3b..0f9954891 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -34,6 +34,6 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService { @Override public Integer IntoAorestCoverage(AorestCoverageVO eastVO) { - return IntoAorestCoverage(eastVO); + return coverageMapper.IntoAorestCoverage(eastVO); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index 3250666ff..ab73ea165 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -44,19 +44,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" non_protected_lands , mountain, non_mountain, - created_by , - created_time + created_by, + created_time ) VALUES ( #{id,jdbcType=VARCHAR}, #{particularYear,jdbcType=VARCHAR}, #{region,jdbcType=VARCHAR}, #{regionEn,jdbcType=VARCHAR}, #{protectedLands,jdbcType=DOUBLE}, - #{nonProtectedLand,jdbcType=DOUBLE}, + #{nonProtectedLands,jdbcType=DOUBLE}, #{mountain,jdbcType=DOUBLE}, #{nonMountain,jdbcType=DOUBLE}, #{createBy,jdbcType=VARCHAR}, - #{createTime,jdbcType=DATE} + #{createTime,jdbcType=TIMESTAMP} ) ]]> diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index 731b4a8e8..fcceeeeaa 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml @@ -5,20 +5,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - - + + @@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" From 498a502c023c8e33049965fa85d8ed209c4546e0 Mon Sep 17 00:00:00 2001 From: qdxkrs <39894542+qdxkrs@users.noreply.github.com> Date: Tue, 24 May 2022 12:01:43 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E6=B7=BB=E5=8A=A0swagger=20=E6=96=B0?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 8 ++++- .../yada/ThematicMapController.java | 13 +++++++- ruoyi-ui/src/views/tool/swagger/index.vue | 31 ++++++++++--------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 403482559..4f8dd03b3 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -34,7 +34,13 @@ io.swagger swagger-models - 1.6.2 + 1.6.6 + + + + com.github.xiaoymin + knife4j-spring-boot-starter + 3.0.3 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java index ad0e78381..9614dd462 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java @@ -3,6 +3,7 @@ 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 io.swagger.annotations.*; import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,10 +17,12 @@ import java.time.LocalDateTime; import java.util.List; /** - * 中国城市监测 + * 专题图模块 + * @author taco chen */ @RestController @RequestMapping(value = "/thematic-map") +@Api(tags = "专题图模块") public class ThematicMapController { @Resource @@ -31,6 +34,14 @@ public class ThematicMapController { * @param request 客户端请求 * @return 参数类 */ + @ApiOperation("获取所有专题图") + @ApiImplicitParams({}) + @ApiResponses({ + @ApiResponse(code =200,message = "请求成功"), + @ApiResponse(code =401,message = "没有认证"), + @ApiResponse(code =403,message = "权限不足"), + @ApiResponse(code =404,message = "未找到") + }) @RequestMapping(value = "/get/all",method = {RequestMethod.GET}) public AjaxResult selectAllThematicMap(HttpServletResponse response, HttpServletRequest request) { diff --git a/ruoyi-ui/src/views/tool/swagger/index.vue b/ruoyi-ui/src/views/tool/swagger/index.vue index 750189115..7c57b68db 100644 --- a/ruoyi-ui/src/views/tool/swagger/index.vue +++ b/ruoyi-ui/src/views/tool/swagger/index.vue @@ -1,15 +1,16 @@ - - + + From 42e4acf3dd901f71d84b247461c45ceb356080f4 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Mon, 30 May 2022 10:11:39 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yada/AorestCoverageController.java | 109 ++++++++++++++++-- .../yada/AustraliaMiddleEastController.java | 14 ++- .../controller/yada/GlobalTypeController.java | 16 ++- .../yada/OceanTemperatureController.java | 15 ++- .../controller/yada/RegionVGIController.java | 14 ++- .../yada/RegionalSystemController.java | 14 ++- .../yada/ThematicMapController.java | 14 ++- .../web/controller/yada/UrbanController.java | 14 ++- .../yada/VegetationCoverageController.java | 14 ++- .../src/main/resources/application-druid.yml | 3 +- .../src/main/resources/application.yml | 2 +- .../framework/web/service/TokenService.java | 2 +- .../ruoyi/system/domain_yada/Dictionary.java | 69 +++++++++++ .../system/domain_yada/GlobalTypeVO.java | 6 +- .../system/domain_yada/ThematicMapDomain.java | 31 +++++ .../ruoyi/system/domain_yada/UploadFile.java | 60 ++++++++++ .../mapper_yada/AorestCoverageMapper.java | 8 ++ .../system/mapper_yada/GlobalTypeMapper.java | 2 +- .../service_yada/IAorestCoverageService.java | 9 ++ .../service_yada/IGlobalTypeService.java | 2 +- .../impl/AorestCoverageServiceimpl.java | 17 +++ .../impl/GlobalTypeServiceimpl.java | 6 +- .../mapper/system/AorestCoverageMapper.xml | 79 +++++++++++++ .../mapper/system/GlobalTypeMapper.xml | 10 +- .../mapper/system/ThematicMapMapper.xml | 11 +- 25 files changed, 494 insertions(+), 47 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index a998f9f39..6da94fe94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -1,21 +1,27 @@ package com.ruoyi.web.controller.yada; +import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.domain_yada.AorestCoverageVO; -import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; +import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.system.domain_yada.*; import com.ruoyi.system.service_yada.IAorestCoverageService; import com.ruoyi.system.service_yada.IAustraliaMiddleEastService; +import com.ruoyi.system.service_yada.ThematicMapService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.xml.crypto.Data; +import java.security.Guard; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.List; @@ -25,17 +31,22 @@ import java.util.List; */ @RestController @RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8") +@Api(tags = "森林覆盖率") public class AorestCoverageController { @Resource private IAorestCoverageService service; + @Resource + private ThematicMapService thematicMapService; + /** * 查询方法 * @param response 响应头 * @param request 客户端请求 * @return 参数类 */ - @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.POST}) + @RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法",httpMethod = "GET") public AjaxResult selectAorestCoverage(HttpServletResponse response, HttpServletRequest request) { List eastVOSList= service.selectAorestCoverage(); @@ -44,10 +55,12 @@ public class AorestCoverageController { /** * 删除方法 - * @param ID 单据id + * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.POST}) + @RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.DELETE}) + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") public AjaxResult DelAorestCoverage(@Param("ID") String ID) { int NUM = service.DelAorestCoverage(ID); @@ -65,9 +78,12 @@ public class AorestCoverageController { * @return 状态码 */ @RequestMapping(value = "/IntoAorestCoverage",method = {RequestMethod.POST}) + @ApiOperation(value = "新增方法",httpMethod = "POST") public AjaxResult IntoAorestCoverage(@RequestBody AorestCoverageVO eastVOS) { try { + + eastVOS.setCreateTime(LocalDateTime.now()); int NUM = service.IntoAorestCoverage(eastVOS); if (NUM>0) @@ -80,6 +96,79 @@ public class AorestCoverageController { E.getMessage(); return AjaxResult.error(); } - } + + /** + * 上传文件 + * @return 状态码 + */ + @RequestMapping(value = "/IntoUpLoad",method = {RequestMethod.POST}) + @ApiOperation(value = "上传文件",httpMethod = "POST") + public AjaxResult IntoUpload(@RequestBody MultipartFile file) + { + UploadFile upload=new UploadFile(); + + ThematicMapDomain domain=new ThematicMapDomain(); + + UploadFile value= null; + try { + value = uploadFile(file,upload); + } catch (Exception e) { + e.printStackTrace(); + } + + int NUM = service.IntoUpload(value); + domain.setPictureCode(value.getFileId()); + +// domain.setCreatedTime(LocalDateTime.now()); +// +// +// thematicMapService.save(domain); + if (NUM>0) + { + return AjaxResult.success(); + } + return AjaxResult.error(); + } + + + /** + * 文件查询 + * @param response 头 + * @param request 客户端请求 + * @return + */ + @RequestMapping(value = "/selectUpload",method = {RequestMethod.GET}) + @ApiOperation(value = "文件查询",httpMethod = "GET") + public AjaxResult selectUpload(HttpServletResponse response, HttpServletRequest request,@RequestBody UploadFile upload) + { + List eastVOSList= service.selectUpload(upload); + return AjaxResult.success(eastVOSList); + } + + + + + public UploadFile uploadFile(MultipartFile file,UploadFile upload) throws Exception + { + // 上传文件路径 + String filePath = RuoYiConfig.getUploadPath(); + // 上传并返回新文件名称 + String fileName = FileUploadUtils.upload(filePath, file); + upload.setFileId(String.valueOf(System.currentTimeMillis())); + upload.setFileName(file.getOriginalFilename()); + upload.setFilePath(fileName); + upload.setFileSize(String.valueOf(file.getSize())); + upload.setCreateTime(LocalDateTime.now()); + return upload; + } + + @RequestMapping(value = "/Dictionary") + @ApiOperation(value = "字典查询",httpMethod = "POST") + public AjaxResult Dictionary(@RequestBody Dictionary dic) + { + List diclist=service.selectDic(dic); + return AjaxResult.success(diclist); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java index c02ec3642..d63cf544f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java @@ -3,6 +3,9 @@ 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -21,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping(value = "/business-service/api/Australia", produces = "application/json;charset=UTF-8") +@Api(tags = "澳大利亚中东部地区") public class AustraliaMiddleEastController { @Resource @@ -32,7 +36,8 @@ public class AustraliaMiddleEastController * @param request 客户端请求 * @return 实体类 */ - @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST}) + @ApiOperation(value = "查询方法",httpMethod = "GET") + @RequestMapping(value = "/SelectAustralia",method = {RequestMethod.GET}) public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request) { List eastVOSList= australiaMiddleEastService.selectAustralia(); @@ -41,10 +46,12 @@ public class AustraliaMiddleEastController /** * 删除方法 - * @param ID 单据id + * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST}) + @RequestMapping(value = "/DelAustralia",method = {RequestMethod.DELETE}) + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") public AjaxResult DelAustralia(@Param("ID") String ID) { int NUM = australiaMiddleEastService.DelAustralia(ID); @@ -62,6 +69,7 @@ public class AustraliaMiddleEastController * @return 状态码 */ @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) + @ApiOperation(value = "新增方法",httpMethod = "POST") public AjaxResult IntoAustralia(@RequestBody AustraliaMiddleEastVO eastVOS) { eastVOS.setCreateTime(LocalDateTime.now()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java index 860257f25..60716f416 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java @@ -5,6 +5,9 @@ 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -23,6 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/monitor/clobal") +@Api(tags = "全球各类型占比") public class GlobalTypeController { @Resource private IGlobalTypeService typeService; @@ -34,18 +38,21 @@ public class GlobalTypeController { * @return 参数类 */ @RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST}) - public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request) + @ApiOperation(value = "查询方法",httpMethod = "POST") + public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request,@RequestBody GlobalTypeVO TypeVO) { - List eastVOSList= typeService.selectGlobalType(); + List eastVOSList= typeService.selectGlobalType(TypeVO.getTypeName(),TypeVO.getParticularYear()); return AjaxResult.success(eastVOSList); } /** * 删除方法 - * @param ID 单据id + * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelGlobalType",method = {RequestMethod.POST}) + @RequestMapping(value = "/DelGlobalType",method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) public AjaxResult DelGlobalType(@Param("ID") String ID) { int NUM = typeService.DelGlobalType(ID); @@ -62,6 +69,7 @@ public class GlobalTypeController { * @param eastVOS 新增实体类 * @return 状态码 */ + @ApiOperation(value = "新增方法",httpMethod = "POST") @RequestMapping(value = "/IntoGlobalType",method = {RequestMethod.POST}) public AjaxResult IntoGlobalType(@RequestBody GlobalTypeVO eastVOS) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java index 84447d796..9d173a7f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java @@ -5,6 +5,9 @@ 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -21,6 +24,7 @@ import java.util.List; /** * 海洋表面温度监测 */ +@Api(tags = "海洋表面温度监测") @RestController @RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8") public class OceanTemperatureController { @@ -33,7 +37,8 @@ public class OceanTemperatureController { * @param request 客户端请求 * @return 参数类 */ - @RequestMapping(value = "/selectOcean",method = {RequestMethod.POST}) + @RequestMapping(value = "/selectOcean",method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法",httpMethod = "GET") public AjaxResult selectOcean(HttpServletResponse response, HttpServletRequest request) { List eastVOSList= temperatureService.selectOcean(); @@ -42,10 +47,13 @@ public class OceanTemperatureController { /** * 删除方法 - * @param ID 单据id + * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelOcean",method = {RequestMethod.POST}) + @RequestMapping(value = "/DelOcean",method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) + public AjaxResult DelOcean(@Param("ID") String ID) { int NUM = temperatureService.DelOcean(ID); @@ -62,6 +70,7 @@ public class OceanTemperatureController { * @param eastVOS 新增实体类 * @return 状态码 */ + @ApiOperation(value = "新增方法",httpMethod = "POST") @RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST}) public AjaxResult IntoOcean(@RequestBody OceanTemperatureVO eastVOS) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java index 20c4fa56e..7bd772c99 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java @@ -3,6 +3,9 @@ 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -20,6 +23,7 @@ import java.util.List; /** * 各区域VGI */ +@Api(tags = "各区域VGI") @RestController @RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8") public class RegionVGIController @@ -32,7 +36,8 @@ public class RegionVGIController * @param request 客户端请求 * @return 参数类 */ - @RequestMapping(value = "/SelectRegion",method = {RequestMethod.POST}) + @RequestMapping(value = "/SelectRegion",method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法",httpMethod = "GET") public AjaxResult SelectRegion(HttpServletResponse response, HttpServletRequest request) { List vgivost= regionVGIService.selectRegion(); @@ -41,10 +46,12 @@ public class RegionVGIController /** * 删除方法 - * @param ID 单据id + * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelRegion",method = {RequestMethod.POST}) + @RequestMapping(value = "/DelRegion",method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) public AjaxResult DelRegion(@Param("ID") String ID) { int NUM = regionVGIService.DelRegion(ID); @@ -61,6 +68,7 @@ public class RegionVGIController * @param vgivo 新增实体类 * @return 状态码 */ + @ApiOperation(value = "新增方法",httpMethod = "POST") @RequestMapping(value = "/IntoRegion",method = {RequestMethod.POST}) public AjaxResult IntoRegion(@RequestBody RegionVGIVO vgivo) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java index 2e0dd5044..7e62948bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java @@ -6,6 +6,9 @@ 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -22,6 +25,7 @@ import java.util.List; /** * 区域生态系统 */ +@Api(tags = "区域生态系统") @RestController @RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8") public class RegionalSystemController { @@ -34,7 +38,8 @@ public class RegionalSystemController { * @param request 客户端请求 * @return 参数类 */ - @RequestMapping(value = "/selectRegional",method = {RequestMethod.POST}) + @RequestMapping(value = "/selectRegional",method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法",httpMethod = "GET") public AjaxResult selectRegional(HttpServletResponse response, HttpServletRequest request) { List eastVOSList= systemService.selectRegional(); @@ -43,10 +48,12 @@ public class RegionalSystemController { /** * 删除方法 - * @param ID 单据id + * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelRegional",method = {RequestMethod.POST}) + @RequestMapping(value = "/DelRegional",method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class) public AjaxResult DelRegional(@Param("ID") String ID) { int NUM = systemService.DelRegional(ID); @@ -63,6 +70,7 @@ public class RegionalSystemController { * @param eastVOS 新增实体类 * @return 状态码 */ + @ApiOperation(value = "新增方法",httpMethod = "POST") @RequestMapping(value = "/IntoRegional",method = {RequestMethod.POST}) public AjaxResult IntoRegional(@RequestBody RegionalSystemVO eastVOS) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java index 9614dd462..6c4d7bec8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java @@ -1,6 +1,9 @@ package com.ruoyi.web.controller.yada; +import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.system.domain_yada.ThematicMapDomain; import com.ruoyi.system.service_yada.ThematicMapService; import io.swagger.annotations.*; @@ -9,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -48,13 +52,14 @@ public class ThematicMapController { List res= thematicMapService.selectAll(); return AjaxResult.success(res); } - /** * 删除方法 - * @param id 单据id + * @param id id * @return 状态码 */ @RequestMapping(value = "/delete",method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class) public AjaxResult deleteThematicMap(@Param("id") Long id) { int num = thematicMapService.deleteById(id); @@ -69,9 +74,12 @@ public class ThematicMapController { * @param thematicMapDomain 新增实体类 * @return 状态码 */ + @ApiOperation(value = "新增方法",httpMethod = "POST") @RequestMapping(value = "/add",method = {RequestMethod.POST}) public AjaxResult saveThematicMap(@RequestBody ThematicMapDomain thematicMapDomain) { + + thematicMapDomain.setCreatedTime(LocalDateTime.now()); int num = thematicMapService.save(thematicMapDomain); if (num>0) { @@ -79,4 +87,6 @@ public class ThematicMapController { } return AjaxResult.error(); } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java index 129f2ff55..dda699379 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java @@ -5,6 +5,9 @@ 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -21,6 +24,7 @@ import java.util.List; /** * 中国城市监测 */ +@Api(tags = "中国城市监测") @RestController @RequestMapping(value = "/business-service/api/Urban", produces = "application/json;charset=UTF-8") public class UrbanController { @@ -33,7 +37,8 @@ public class UrbanController { * @param request 客户端请求 * @return 参数类 */ - @RequestMapping(value = "/selectUrban",method = {RequestMethod.POST}) + @RequestMapping(value = "/selectUrban",method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法",httpMethod = "GET") public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request) { List eastVOSList= urbanService.selectUrban(); @@ -42,10 +47,11 @@ public class UrbanController { /** * 删除方法 - * @param ID 单据id + * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelUrban",method = {RequestMethod.POST}) + @RequestMapping(value = "/DelUrban",method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") public AjaxResult DelUrban(@Param("ID") String ID) { int NUM = urbanService.DelUrban(ID); @@ -62,7 +68,9 @@ public class UrbanController { * @param eastVOS 新增实体类 * @return 状态码 */ + @ApiOperation(value = "新增方法",httpMethod = "POST") @RequestMapping(value = "/IntoUrban",method = {RequestMethod.POST}) + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class) public AjaxResult IntoUrban(@RequestBody UrbanVO eastVOS) { eastVOS.setCreateTime(LocalDateTime.now()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java index 7d7db94d9..04cd4e870 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java @@ -5,6 +5,9 @@ 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -21,6 +24,7 @@ import java.util.List; /** * 平均植被覆盖度和净初级生产力 */ +@Api(tags = "平均植被覆盖度和净初级生产力") @RestController @RequestMapping(value = "/business-service/api/Vegetation", produces = "application/json;charset=UTF-8") public class VegetationCoverageController { @@ -33,7 +37,8 @@ public class VegetationCoverageController { * @param request 客户端请求 * @return 参数类 */ - @RequestMapping(value = "/selectVegetation",method = {RequestMethod.POST}) + @RequestMapping(value = "/selectVegetation",method = {RequestMethod.GET}) + @ApiOperation(value = "查询方法",httpMethod = "GET") public AjaxResult selectVegetation(HttpServletResponse response, HttpServletRequest request) { List eastVOSList= coverageService.selectVegetation(); @@ -42,10 +47,12 @@ public class VegetationCoverageController { /** * 删除方法 - * @param ID 单据id + * @param ID id * @return 状态码 */ - @RequestMapping(value = "/DelVegetation",method = {RequestMethod.POST}) + @RequestMapping(value = "/DelVegetation",method = {RequestMethod.DELETE}) + @ApiOperation(value = "删除方法",httpMethod = "DELETE") + @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class) public AjaxResult DelVegetation(@Param("ID") String ID) { int NUM = coverageService.DelVegetation(ID); @@ -62,6 +69,7 @@ public class VegetationCoverageController { * @param eastVOS 新增实体类 * @return 状态码 */ + @ApiOperation(value = "新增方法",httpMethod = "POST") @RequestMapping(value = "/IntoVegetation",method = {RequestMethod.POST}) public AjaxResult IntoVegetation(@RequestBody VegetationCoverageVO eastVOS) { diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 9bff4eb18..9d18a7d5c 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,7 +6,8 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.2.9:3306/nuoyi?useUnicode=true&characterEncoding=UTF-8&useSSL=false&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 + url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: saas password: XKrs123. # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index da6fb4a28..08ec999a1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -92,7 +92,7 @@ token: # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz # 令牌有效期（默认30分钟） - expireTime: 30 + expireTime: 300 # MyBatis配置 mybatis: diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java index 5b4c41466..f053fb356 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java @@ -144,7 +144,7 @@ public class TokenService loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); // 根据uuid将loginUser缓存 String userKey = getTokenKey(loginUser.getToken()); - redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); + redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.HOURS); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java new file mode 100644 index 000000000..c485023aa --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java @@ -0,0 +1,69 @@ +package com.ruoyi.system.domain_yada; + +/** + * @Author: JinSheng Song + * @Date: 2022/5/30 8:50 + */ +//字典表 +public class Dictionary extends SysBaseEntity +{ + private String codingType; + + private String codingType1; + + private String codingType2; + + private String dictionary; + + private String name; + + private String nameEn; + + public String getCodingType1() { + return codingType1; + } + + public void setCodingType1(String codingType1) { + this.codingType1 = codingType1; + } + + public String getCodingType2() { + return codingType2; + } + + public void setCodingType2(String codingType2) { + this.codingType2 = codingType2; + } + + public String getCodingType() { + return codingType; + } + + public void setCodingType(String codingType) { + this.codingType = codingType; + } + + public String getDictionary() { + return dictionary; + } + + public void setDictionary(String dictionary) { + this.dictionary = dictionary; + } + + 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; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java index a1c20a217..de15e7b67 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java @@ -15,7 +15,7 @@ public class GlobalTypeVO extends SysBaseEntity { private Double areaProportion; - private String area; + private Double area; private int particularYear; @@ -51,11 +51,11 @@ public class GlobalTypeVO extends SysBaseEntity { this.areaProportion = areaProportion; } - public String getArea() { + public Double getArea() { return area; } - public void setArea(String area) { + public void setArea(Double area) { this.area = area; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java index 39fc939e4..11caf150e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java @@ -11,6 +11,12 @@ public class ThematicMapDomain extends SysBaseEntity { private Long id; + private String pictureCode; + + private String pictureTypeOne; + + private String pictureTypeTwo; + private String pictureZh; private String pictureEn; @@ -29,6 +35,31 @@ public class ThematicMapDomain extends SysBaseEntity { private LocalDateTime createdTime; + public String getPictureCode() { + return pictureCode; + } + + public void setPictureCode(String pictureCode) { + this.pictureCode = pictureCode; + } + + public String getPictureTypeOne() { + return pictureTypeOne; + } + + public void setPictureTypeOne(String pictureTypeOne) { + this.pictureTypeOne = pictureTypeOne; + } + + public String getPictureTypeTwo() { + return pictureTypeTwo; + } + + public void setPictureTypeTwo(String pictureTypeTwo) { + this.pictureTypeTwo = pictureTypeTwo; + } + + public Long getId() { return id; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java new file mode 100644 index 000000000..6d0529a9f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java @@ -0,0 +1,60 @@ +package com.ruoyi.system.domain_yada; + +import java.time.LocalDate; + +/** + * @Author: JinSheng Song + * @Date: 2022/5/24 14:24 + */ +public class UploadFile extends SysBaseEntity +{ + private String id; + + private String fileId; + + private String fileName; + + private String filePath; + + private String fileSize; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getFileId() { + return fileId; + } + + public void setFileId(String fileId) { + this.fileId = fileId; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public String getFileSize() { + return fileSize; + } + + public void setFileSize(String fileSize) { + this.fileSize = fileSize; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java index 0931f079f..bf9d00c02 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper_yada; import com.ruoyi.system.domain_yada.AorestCoverageVO; +import com.ruoyi.system.domain_yada.Dictionary; +import com.ruoyi.system.domain_yada.UploadFile; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,4 +18,10 @@ public interface AorestCoverageMapper { Integer DelAorestCoverage(@Param("id") String id); Integer IntoAorestCoverage(AorestCoverageVO eastVO); + + Integer IntoUpload(UploadFile file); + + List selectUpload(UploadFile file); + + List selectDic(Dictionary dic); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java index c6d93ba6c..8366c5ce6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java @@ -11,7 +11,7 @@ import java.util.List; */ public interface GlobalTypeMapper { - List selectGlobalType(); + List selectGlobalType(@Param("typeName") String typeName, @Param("particularYear") Integer particularYear); Integer DelGlobalType(@Param("id") String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java index 938d9b3bb..0e53908a9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java @@ -1,7 +1,10 @@ package com.ruoyi.system.service_yada; +import com.ruoyi.common.utils.PageUtils; import com.ruoyi.system.domain_yada.AorestCoverageVO; import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO; +import com.ruoyi.system.domain_yada.Dictionary; +import com.ruoyi.system.domain_yada.UploadFile; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,4 +21,10 @@ public interface IAorestCoverageService { public Integer DelAorestCoverage(@Param("id") String id); public Integer IntoAorestCoverage(AorestCoverageVO eastVO); + + public Integer IntoUpload(UploadFile file); + + public List selectUpload(UploadFile file); + + public List selectDic(Dictionary dic); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java index e09d8a5d3..08804ac47 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface IGlobalTypeService { - public List selectGlobalType(); + public List selectGlobalType(String typeName, Integer particularYear); public Integer DelGlobalType(String id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index 0f9954891..6f0271493 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -2,6 +2,8 @@ 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.domain_yada.Dictionary; +import com.ruoyi.system.domain_yada.UploadFile; import com.ruoyi.system.mapper_yada.AorestCoverageMapper; import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IAorestCoverageService; @@ -36,4 +38,19 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService { public Integer IntoAorestCoverage(AorestCoverageVO eastVO) { return coverageMapper.IntoAorestCoverage(eastVO); } + + @Override + public Integer IntoUpload(UploadFile file) { + return coverageMapper.IntoUpload(file); + } + + @Override + public List selectUpload(UploadFile file) { + return coverageMapper.selectUpload(file); + } + + @Override + public List selectDic(Dictionary dic) { + return coverageMapper.selectDic(dic); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java index 1f3f7d3b6..a86b6c23f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java @@ -5,6 +5,8 @@ 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.apache.commons.compress.archivers.dump.DumpArchiveEntry; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,8 +26,8 @@ public class GlobalTypeServiceimpl implements IGlobalTypeService { @Override - public List selectGlobalType() { - return typeMapper.selectGlobalType(); + public List selectGlobalType(String typeName, Integer particularYear) { + return typeMapper.selectGlobalType(typeName, particularYear); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index ab73ea165..378f41646 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -61,4 +61,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml index 314d8ebae..5ed298ce6 100644 --- a/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml @@ -21,9 +21,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" id,particular_year,type_name,type_name_en,area_proportion,area,created_by,created_time ]]> - diff --git a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml index 8bc6ab2a5..5f796b70f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml @@ -6,6 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -19,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -40,6 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" picture_en , picture_name , picture_type , + picture_type_one, + picture_type_two, + picture_code, picture_time , picture_path, remarks, @@ -51,6 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{pictureEn,jdbcType=VARCHAR}}, #{pictureName,jdbcType=VARCHAR}}, #{pictureType,jdbcType=VARCHAR}}, + #{pictureTypeOne,jdbcType=VARCHAR}}, + #{pictureTypeTwo,jdbcType=VARCHAR}}, + #{pictureCode,jdbcType=VARCHAR}}, #{pictureTime,jdbcType=TIMESTAMP}, #{picturePath,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, From bd12230d7e70c4bc70be71ce5015d848e44a4068 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Mon, 30 May 2022 10:17:07 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9token=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/framework/web/service/TokenService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java index f053fb356..5b4c41466 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java @@ -144,7 +144,7 @@ public class TokenService loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE); // 根据uuid将loginUser缓存 String userKey = getTokenKey(loginUser.getToken()); - redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.HOURS); + redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES); } /** From a4976eff139d522eb9bf79d891efbb8ea14bb2cc Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Tue, 31 May 2022 10:47:05 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=92=8Ctoken=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yada/AorestCoverageController.java | 8 ++--- .../src/main/resources/application.yml | 17 +++++++++++ ruoyi-framework/pom.xml | 8 +++++ .../web/service/SysLoginService.java | 8 ++--- .../mapper_yada/AorestCoverageMapper.java | 5 ++-- .../service_yada/IAorestCoverageService.java | 7 +++-- .../impl/AorestCoverageServiceimpl.java | 10 ++++--- .../mapper/system/AorestCoverageMapper.xml | 29 +++++++++---------- 8 files changed, 58 insertions(+), 34 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java index 6da94fe94..00447d8ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java @@ -120,10 +120,6 @@ public class AorestCoverageController { int NUM = service.IntoUpload(value); domain.setPictureCode(value.getFileId()); -// domain.setCreatedTime(LocalDateTime.now()); -// -// -// thematicMapService.save(domain); if (NUM>0) { return AjaxResult.success(); @@ -142,7 +138,7 @@ public class AorestCoverageController { @ApiOperation(value = "文件查询",httpMethod = "GET") public AjaxResult selectUpload(HttpServletResponse response, HttpServletRequest request,@RequestBody UploadFile upload) { - List eastVOSList= service.selectUpload(upload); + List eastVOSList= service.selectUpload(upload.getFileId(),upload.getFileName()); return AjaxResult.success(eastVOSList); } @@ -167,7 +163,7 @@ public class AorestCoverageController { @ApiOperation(value = "字典查询",httpMethod = "POST") public AjaxResult Dictionary(@RequestBody Dictionary dic) { - List diclist=service.selectDic(dic); + List diclist=service.selectDic(dic.getCodingType(),dic.getCodingType1(), dic.getCodingType2()); return AjaxResult.success(diclist); } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 08ec999a1..603a382ed 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -103,6 +103,23 @@ mybatis: # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml +## 滑块验证码 +#aj: +# captcha: +# # 缓存类型 +# cache-type: redis +# # blockPuzzle 滑块 clickWord 文字点选 default默认两者都实例化 +# type: blockPuzzle +# # 右下角显示字 +# water-mark: ruoyi.vip +# # 校验滑动拼图允许误差偏移量(默认5像素) +# slip-offset: 5 +# # aes加密坐标开启或者禁用(true|false) +# aes-status: true +# # 滑动干扰项(0/1/2) +# interference-options: 2 + + # PageHelper分页插件 pagehelper: helperDialect: mysql diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 39b2d88cf..fd4fa2e42 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -35,6 +35,14 @@ druid-spring-boot-starter + + + + + + + + com.github.penggle diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 6f8b9aa5c..1f937ef75 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -27,7 +27,7 @@ import com.ruoyi.system.service.ISysUserService; /** * 登录校验方法 - * + * * @author ruoyi */ @Component @@ -41,7 +41,7 @@ public class SysLoginService @Autowired private RedisCache redisCache; - + @Autowired private ISysUserService userService; @@ -50,7 +50,7 @@ public class SysLoginService /** * 登录验证 - * + * * @param username 用户名 * @param password 密码 * @param code 验证码 @@ -95,7 +95,7 @@ public class SysLoginService /** * 校验验证码 - * + * * @param username 用户名 * @param code 验证码 * @param uuid 唯一标识 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java index bf9d00c02..77aa5bbfc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java @@ -21,7 +21,8 @@ public interface AorestCoverageMapper { Integer IntoUpload(UploadFile file); - List selectUpload(UploadFile file); + List selectUpload(@Param("fileId") String fileId,@Param("fileName") String fileName); - List selectDic(Dictionary dic); + List selectDic(@Param("codingType") String codingType,@Param("codingType1") String codingType1, + @Param("codingType2") String codingType2); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java index 0e53908a9..362f9ff7a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java @@ -18,13 +18,14 @@ public interface IAorestCoverageService { public List selectAorestCoverage(); - public Integer DelAorestCoverage(@Param("id") String id); + public Integer DelAorestCoverage(String id); public Integer IntoAorestCoverage(AorestCoverageVO eastVO); public Integer IntoUpload(UploadFile file); - public List selectUpload(UploadFile file); + public List selectUpload(String fileId,String fileName); - public List selectDic(Dictionary dic); + List selectDic(String codingType,String codingType1, + String codingType2); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java index 6f0271493..206152212 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java @@ -7,6 +7,7 @@ import com.ruoyi.system.domain_yada.UploadFile; import com.ruoyi.system.mapper_yada.AorestCoverageMapper; import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper; import com.ruoyi.system.service_yada.IAorestCoverageService; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -45,12 +46,13 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService { } @Override - public List selectUpload(UploadFile file) { - return coverageMapper.selectUpload(file); + public List selectUpload(String fileId, String fileName) { + return coverageMapper.selectUpload(fileId,fileName); } @Override - public List selectDic(Dictionary dic) { - return coverageMapper.selectDic(dic); + public List selectDic(String codingType,String codingType1, + String codingType2) { + return coverageMapper.selectDic(codingType,codingType1,codingType2); } } diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index 378f41646..ee9470fb8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -96,11 +96,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -117,26 +117,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" From 2de946adb8ad519c71cf6024ccd92dab25ba8623 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Wed, 8 Jun 2022 17:18:59 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=84=E4=B8=AA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=B8=8A=E5=BA=8A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 28 +- .../controller/yada/SpecialController.java | 302 ++++++++++++++++++ .../yada/SpecialReportController.java | 7 - .../src/main/resources/application-druid.yml | 21 +- .../mapper/generator/GenTableColumnMapper.xml | 4 +- .../mapper/generator/GenTableMapper.xml | 4 +- .../mapper/quartz/SysJobLogMapper.xml | 2 +- .../resources/mapper/quartz/SysJobMapper.xml | 4 +- .../domain_yada/AustraliaMiddleEastVO.java | 15 +- .../ruoyi/system/domain_yada/RegionVGIVO.java | 6 +- .../mapper/system/AorestCoverageMapper.xml | 5 +- .../system/AustraliaMiddleEastMapper.xml | 9 +- .../mapper/system/RegionVGIMapper.xml | 6 +- .../mapper/system/RegionalSystemMapper.xml | 4 +- .../mapper/system/SysConfigMapper.xml | 4 +- .../resources/mapper/system/SysDeptMapper.xml | 4 +- .../mapper/system/SysDictDataMapper.xml | 4 +- .../mapper/system/SysDictTypeMapper.xml | 4 +- .../resources/mapper/system/SysMenuMapper.xml | 12 +- .../mapper/system/SysNoticeMapper.xml | 4 +- .../mapper/system/SysOperLogMapper.xml | 2 +- .../resources/mapper/system/SysPostMapper.xml | 4 +- .../resources/mapper/system/SysRoleMapper.xml | 4 +- .../resources/mapper/system/SysUserMapper.xml | 4 +- .../system/VegetationCoverageMapper.xml | 4 +- 25 files changed, 397 insertions(+), 70 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 4f8dd03b3..5f4c2efef 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -17,7 +17,27 @@ - + + + org.apache.poi + + poi + + 4.0.1 + + + + + + org.apache.poi + + poi-ooxml + + 4.0.1 + + + + org.springframework.boot spring-boot-devtools @@ -42,6 +62,12 @@ knife4j-spring-boot-starter 3.0.3 + + + org.postgresql + postgresql + 42.2.20 + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java new file mode 100644 index 000000000..aee5ccccb --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java @@ -0,0 +1,302 @@ +package com.ruoyi.web.controller.yada; + +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.domain_yada.*; +import com.ruoyi.system.service_yada.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@RestController +@RequestMapping(value = "/Special") +@Api(tags = "模板导入") +public class SpecialController { + + @Resource + private IRegionVGIService regionVGIService; + + @Resource + private IAustraliaMiddleEastService australiaMiddleEastService; + + @Resource + private IAorestCoverageService service; + + @Resource + private IVegetationCoverageService coverageService; + + @Resource + private IRegionalSystemService systemService; + + /** + */ + + @RequestMapping(value = "/helpSaveExcel") + private AjaxResult helpSaveExcel(@RequestBody MultipartFile file) { + List value = saveExcel(file); + + return IntoRegion(value); + } + + /** + * 森林覆盖率模板导入 + */ + @RequestMapping(value = "/helpExcelAorest") + private AjaxResult helpExcelAorest(@RequestBody MultipartFile file) { + List value = saveExcelAorest(file); + + return IntoAorestCoverage(value); + } + + /** + *平均植被覆盖度和净初级生产力 + */ + @RequestMapping(value = "/helpExcelnpp") + private AjaxResult helpExcelnpp(@RequestBody MultipartFile file) { + List value = saveExcelnpp(file); + + return IntoVegetation(value); + } + + /** + * 澳大利亚中部地区模板导入 + */ + @RequestMapping(value = "/helpExcelAus") + private AjaxResult helpExcelAus(@RequestBody MultipartFile file) { + List value = saveExcelAus(file); + + return IntoAustralia(value); + } + + /** + * 区域生态系统类型转移 + */ + @RequestMapping(value = "/helpExcelRegion") + private AjaxResult helpExcelRegion(@RequestBody MultipartFile file) { + List value = saveExcelRegion(file); + + return IntoRegional(value); + } + + public AjaxResult IntoRegional(List eastVOS) + { + try { + for (int i = 0; i < eastVOS.size(); i++) { + eastVOS.get(i).setCreateTime(LocalDateTime.now()); + systemService.IntoRegional(eastVOS.get(i)); + } + return AjaxResult.success(); + } + catch (Exception E){ + E.getMessage(); + return AjaxResult.error(E.getMessage()); + } + } + + public AjaxResult IntoAustralia(List eastVOS) { + + for (int i = 0; i < eastVOS.size(); i++) { + eastVOS.get(i).setCreateTime(LocalDateTime.now()); + australiaMiddleEastService.IntoAustralia(eastVOS.get(i)); + } + + return AjaxResult.success(); + } + + public AjaxResult IntoRegion(List vgivo) { + for (int i = 0; i < vgivo.size(); i++) { + vgivo.get(i).setCreatedTime(LocalDateTime.now()); + + regionVGIService.IntoRegion(vgivo.get(i)); + } + + return AjaxResult.success(); + + } + + public AjaxResult IntoAorestCoverage(List eastVOS) + { + try { + for (int i = 0; i < eastVOS.size(); i++) { + eastVOS.get(i).setCreateTime(LocalDateTime.now()); + service.IntoAorestCoverage(eastVOS.get(i)); + } + return AjaxResult.success(); + } + catch (Exception E){ + E.getMessage(); + return AjaxResult.error(E.getMessage()); + } + } + + public AjaxResult IntoVegetation(List eastVOS) + { + try { + for (int i = 0; i < eastVOS.size(); i++) { + eastVOS.get(i).setCreateTime(LocalDateTime.now()); + coverageService.IntoVegetation(eastVOS.get(i)); + } + return AjaxResult.success(); + } + catch (Exception E){ + E.getMessage(); + return AjaxResult.error(E.getMessage()); + } + } + + private List saveExcel(MultipartFile file) { + + try { + List Value = new ArrayList<>(); + InputStream inputStream = file.getInputStream(); + Workbook book; + Sheet sheet; + book = new XSSFWorkbook(inputStream); + sheet = book.getSheetAt(0); + for (int i = 1; i < sheet.getLastRowNum() + 1; i++) { + RegionVGIVO value = new RegionVGIVO(); + Row row = sheet.getRow(i); + value.setCreatedTime(LocalDateTime.now()); + value.setRegion(row.getCell(0).toString()); + value.setRegionEn(row.getCell(1).toString()); + value.setForest(Double.parseDouble(row.getCell(2).toString())); + value.setGrassland(Double.parseDouble(row.getCell(3).toString())); + value.setParticularYear(row.getCell(4).toString()); + Value.add(value); + } + return Value; + } catch (IOException e) { + e.printStackTrace(); + return null; + } + + + } + + private List saveExcelAus(MultipartFile file) { + + try { + List Value = new ArrayList<>(); + InputStream inputStream = file.getInputStream(); + Workbook book; + Sheet sheet; + book = new XSSFWorkbook(inputStream); + sheet = book.getSheetAt(0); + for (int i = 1; i < sheet.getLastRowNum() + 1; i++) { + AustraliaMiddleEastVO value = new AustraliaMiddleEastVO(); + Row row = sheet.getRow(i); + value.setYearMonth(Double.parseDouble(row.getCell(0).toString())); + value.setMonth(Double.parseDouble(row.getCell(1).toString())); + value.setSstAnomalyIndex(Double.parseDouble(row.getCell(2).toString())); + value.setTemperatureAnomolies(Double.parseDouble(row.getCell(3).toString())); + value.setPrecipitationAnomolies(Double.parseDouble(row.getCell(4).toString())); + value.setVaiAnomolies(Double.parseDouble(row.getCell(5).toString())); + Value.add(value); + } + return Value; + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } + + private List saveExcelAorest(MultipartFile file) { + + try { + List Value = new ArrayList<>(); + InputStream inputStream = file.getInputStream(); + Workbook book; + Sheet sheet; + book = new XSSFWorkbook(inputStream); + sheet = book.getSheetAt(0); + for (int i = 1; i < sheet.getLastRowNum() + 1; i++) { + AorestCoverageVO value = new AorestCoverageVO(); + Row row = sheet.getRow(i); + value.setRegion(row.getCell(0).toString()); + value.setRegionEn(row.getCell(1).toString()); + value.setProtectedLands(Double.parseDouble(row.getCell(2).toString())); + value.setNonProtectedLands(Double.parseDouble(row.getCell(3).toString())); + value.setMountain(Double.parseDouble(row.getCell(4).toString())); + value.setNonMountain(Double.parseDouble(row.getCell(5).toString())); + value.setCreateTime(LocalDateTime.now()); + Value.add(value); + } + return Value; + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } + + private List saveExcelnpp(MultipartFile file) { + + try { + List Value = new ArrayList<>(); + InputStream inputStream = file.getInputStream(); + Workbook book; + Sheet sheet; + book = new XSSFWorkbook(inputStream); + sheet = book.getSheetAt(0); + for (int i = 1; i < sheet.getLastRowNum() + 1; i++) { + VegetationCoverageVO value = new VegetationCoverageVO(); + Row row = sheet.getRow(i); + value.setRegion(row.getCell(0).toString()); + value.setRegionEn(row.getCell(1).toString()); + value.setProtectedLands(Double.parseDouble(row.getCell(4).toString())); + value.setNonProtectedLands(Double.parseDouble(row.getCell(5).toString())); + value.setMountain(Double.parseDouble(row.getCell(2).toString())); + value.setNonMountain(Double.parseDouble(row.getCell(3).toString())); + value.setCreateTime(LocalDateTime.now()); + Value.add(value); + } + return Value; + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } + + private List saveExcelRegion(MultipartFile file) { + + try { + List Value = new ArrayList<>(); + InputStream inputStream = file.getInputStream(); + Workbook book; + Sheet sheet; + book = new XSSFWorkbook(inputStream); + sheet = book.getSheetAt(0); + for (int i = 1; i < sheet.getLastRowNum() + 1; i++) { + RegionalSystemVO value = new RegionalSystemVO(); + Row row = sheet.getRow(i); + value.setRegion(row.getCell(0).toString()); + value.setRegionEn(row.getCell(1).toString()); + value.setTypeConversion(row.getCell(2).toString()); + value.setTypeconversionEn(row.getCell(3).toString()); + value.setProportionOfChangedAreas(Double.parseDouble(row.getCell(4).toString())); + value.setCreateTime(LocalDateTime.now()); + Value.add(value); + } + return Value; + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java deleted file mode 100644 index 51c3468b7..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialReportController.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ruoyi.web.controller.yada; - -/** - * 专题报告 - */ -public class SpecialReportController { -} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 9d18a7d5c..31dfb10a3 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -2,14 +2,16 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.cj.jdbc.Driver +# driverClassName: com.mysql.cj.jdbc.Driver + driver-class-name: org.postgresql.Driver druid: - # 主库数据源 master: -# url: jdbc:mysql://192.168.2.9:3306/nuoyi?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: saas - password: XKrs123. + url: jdbc:postgresql://192.168.2.9:5432/yada?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai + username: sjs + password: song5325 +# url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai +# username: saas +# password: XKrs123. # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -31,8 +33,9 @@ spring: minEvictableIdleTimeMillis: 300000 # 配置一个连接在池中最大生存的时间，单位是毫秒 maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL + # 配置检测连接是否有效select * from pg_stat_activity +# validationQuery: SELECT 1 FROM DUAL + validationQuery: SELECT version() testWhileIdle: true testOnBorrow: false testOnReturn: false @@ -55,4 +58,4 @@ spring: merge-sql: true wall: config: - multi-statement-allow: true \ No newline at end of file + multi-statement-allow: true diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 0bf0eea90..6ff3ef6f7 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{dictType}, #{sort}, #{createBy}, - sysdate() + current_timestamp ) @@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dict_type = #{dictType}, sort = #{sort}, update_by = #{updateBy}, - update_time = sysdate() + update_time = current_timestamp where column_id = #{columnId} diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml index a5d014543..e99b74f32 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{genPath}, #{remark}, #{createBy}, - sysdate() + current_timestamp ) @@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" options = #{options}, update_by = #{updateBy}, remark = #{remark}, - update_time = sysdate() + update_time = current_timestamp where table_id = #{tableId} diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index 588d17705..32966a1ca 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jobMessage}, #{status}, #{exceptionInfo}, - sysdate() + current_timestamp ) diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 69233bdf7..15399c8ec 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = current_timestamp where job_id = #{jobId} @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, - sysdate() + current_timestamp ) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java index e6e977f40..468819bd1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/AustraliaMiddleEastVO.java @@ -10,7 +10,9 @@ public class AustraliaMiddleEastVO extends SysBaseEntity { private String id; - private LocalDate yearMonth; + private Double yearMonth; + + private Double month; private Double sstAnomalyIndex; @@ -28,11 +30,11 @@ public class AustraliaMiddleEastVO extends SysBaseEntity this.id = id; } - public LocalDate getYearMonth() { + public Double getYearMonth() { return yearMonth; } - public void setYearMonth(LocalDate yearMonth) { + public void setYearMonth(Double yearMonth) { this.yearMonth = yearMonth; } @@ -68,4 +70,11 @@ public class AustraliaMiddleEastVO extends SysBaseEntity this.vaiAnomolies = vaiAnomolies; } + public Double getMonth() { + return month; + } + + public void setMonth(Double month) { + this.month = month; + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java index c46577ce9..41601576b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/RegionVGIVO.java @@ -23,7 +23,7 @@ public class RegionVGIVO implements Serializable { private Double grassland; - private Integer particularYear; + private String particularYear; private String createdBy; @@ -85,11 +85,11 @@ public class RegionVGIVO implements Serializable { this.grassland = grassland; } - public Integer getParticularYear() { + public String getParticularYear() { return particularYear; } - public void setParticularYear(Integer particularYear) { + public void setParticularYear(String particularYear) { this.particularYear = particularYear; } diff --git a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml index ee9470fb8..b8813301a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml @@ -5,7 +5,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -36,7 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -18,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -34,8 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index b1570e289..d14d1b9e7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{configType}, #{createBy}, #{remark}, - sysdate() + current_timestamp ) @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" config_type = #{configType}, update_by = #{updateBy}, remark = #{remark}, - update_time = sysdate() + update_time = current_timestamp where config_id = #{configId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 984f89ccc..6a563e85e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{email}, #{status}, #{createBy}, - sysdate() + current_timestamp ) @@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" email = #{email}, status = #{status}, update_by = #{updateBy}, - update_time = sysdate() + update_time = current_timestamp where dept_id = #{deptId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 75d80a157..f7b5d5d68 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = current_timestamp where dict_code = #{dictCode} @@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, - sysdate() + current_timestamp ) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 2b44b2eee..6d65a7921 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = current_timestamp where dict_id = #{dictId} @@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, - sysdate() + current_timestamp ) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index f11402c7f..8b31b47b8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -28,7 +28,7 @@ - select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time + select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, nullif(perms,'') as perms, icon, create_time from sys_menu @@ -49,13 +49,13 @@ diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 2425ae058..8b73469a3 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = current_timestamp where post_id = #{postId} @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, - sysdate() + current_timestamp ) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index a8d3ede58..2a34ceef1 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -117,7 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, - sysdate() + current_timestamp ) @@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, - update_time = sysdate() + update_time = current_timestamp where role_id = #{roleId} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 16a64c2a3..df55eda3d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{createBy}, #{remark}, - sysdate() + current_timestamp ) @@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_date = #{loginDate}, update_by = #{updateBy}, remark = #{remark}, - update_time = sysdate() + update_time = current_timestamp where user_id = #{userId} diff --git a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml index 24e0e6b33..df3dd9245 100644 --- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml @@ -35,7 +35,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" Date: Thu, 16 Jun 2022 09:24:27 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/RuoYiApplication.java | 1 + .../controller/system/SysLoginController.java | 19 ++- .../controller/yada/SpecialController.java | 30 ++++- ...m.anji.captcha.service.CaptchaCacheService | 1 + .../src/main/resources/application.yml | 100 ++++++++-------- .../ruoyi/common/utils/file/WeatherUtils.java | 66 +++++++++++ ruoyi-framework/pom.xml | 12 +- .../framework/config/SecurityConfig.java | 1 + .../web/service/CaptchaRedisService.java | 53 +++++++++ .../web/service/SysLoginService.java | 56 +++------ .../com/ruoyi/system/domain_yada/CastsVo.java | 110 ++++++++++++++++++ .../ruoyi/system/domain_yada/ForecastVo.java | 62 ++++++++++ .../com/ruoyi/system/domain_yada/LivesVo.java | 110 ++++++++++++++++++ .../system/domain_yada/WeatherUtilsVO.java | 85 ++++++++++++++ 14 files changed, 598 insertions(+), 108 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/META-INF/com.anji.captcha.service.CaptchaCacheService create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/file/WeatherUtils.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/CaptchaRedisService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 7ecbd0496..5eab88c93 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -29,4 +29,5 @@ public class RuoYiApplication " | | \\ / \\ / \n" + " ''-' `'-' `-..-' "); } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index d959a17e0..600265f57 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -12,9 +12,11 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.framework.web.service.SysLoginService; import com.ruoyi.framework.web.service.SysPermissionService; +import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.service.ISysMenuService; /** @@ -34,6 +36,9 @@ public class SysLoginController @Autowired private SysPermissionService permissionService; + @Autowired + private TokenService tokenService; + /** * 登录方法 * @@ -45,8 +50,7 @@ public class SysLoginController { AjaxResult ajax = AjaxResult.success(); // 生成令牌 - String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), - loginBody.getUuid()); + String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode()); ajax.put(Constants.TOKEN, token); return ajax; } @@ -59,7 +63,8 @@ public class SysLoginController @GetMapping("getInfo") public AjaxResult getInfo() { - SysUser user = SecurityUtils.getLoginUser().getUser(); + LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); + SysUser user = loginUser.getUser(); // 角色集合 Set roles = permissionService.getRolePermission(user); // 权限集合 @@ -79,8 +84,10 @@ public class SysLoginController @GetMapping("getRouters") public AjaxResult getRouters() { - Long userId = SecurityUtils.getUserId(); - List menus = menuService.selectMenuTreeByUserId(userId); + LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest()); + // 用户信息 + SysUser user = loginUser.getUser(); + List menus = menuService.selectMenuTreeByUserId(user.getUserId()); return AjaxResult.success(menuService.buildMenus(menus)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java index aee5ccccb..5dce08793 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/SpecialController.java @@ -1,10 +1,14 @@ package com.ruoyi.web.controller.yada; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.file.WeatherUtils; import com.ruoyi.system.domain_yada.*; import com.ruoyi.system.service_yada.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import jdk.jfr.Frequency; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -16,14 +20,20 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +import springfox.documentation.spring.web.json.Json; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.net.http.HttpRequest; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @RequestMapping(value = "/Special") @@ -55,7 +65,25 @@ public class SpecialController { return IntoRegion(value); } - /** + @RequestMapping(value = "/helpWeatherClass",method = {RequestMethod.GET}) + public AjaxResult helpWeatherClass(String city,String type) + { + String url="https://restapi.amap.com/v3/weather/weatherInfo"; + Map map=new HashMap<>(); + map.put("key","37087f0a3007dc67d37859553cd02d33"); + map.put("city",city); + if (type!=null){ map.put("extensions",type);} + map.put("output","json"); + String value= WeatherUtils.httpRequest(url,map); + WeatherUtilsVO vo = JSON.parseObject(value,WeatherUtilsVO.class); +// String value2=vo.getForecasts().substring(1,vo.getForecasts().length()-1); +// System.out.println(value2); +// vo.setForecast(JSON.parseObject(value2,ForecastVo.class)); +// JSONObject userJson=JSONObject.parseObject(value); +// WeatherUtilsVO utilsValue= JSON.toJavaObject(userJson,WeatherUtilsVO.class); + + return AjaxResult.success(vo); + } /** * 森林覆盖率模板导入 */ @RequestMapping(value = "/helpExcelAorest") diff --git a/ruoyi-admin/src/main/resources/META-INF/com.anji.captcha.service.CaptchaCacheService b/ruoyi-admin/src/main/resources/META-INF/com.anji.captcha.service.CaptchaCacheService new file mode 100644 index 000000000..b2442bc02 --- /dev/null +++ b/ruoyi-admin/src/main/resources/META-INF/com.anji.captcha.service.CaptchaCacheService @@ -0,0 +1 @@ +com.ruoyi.framework.web.service.CaptchaRedisService \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 603a382ed..fbf3866ad 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -3,9 +3,9 @@ ruoyi: # 名称 name: RuoYi # 版本 - version: 3.8.2 + version: 3.4.0 # 版权年份 - copyrightYear: 2022 + copyrightYear: 2021 # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） @@ -25,13 +25,10 @@ server: tomcat: # tomcat的URI编码 uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 + # tomcat最大线程数，默认为200 + max-threads: 800 + # Tomcat启动初始化的线程数，默认值25 + min-spare-threads: 30 # 日志配置 logging: @@ -41,22 +38,19 @@ logging: # Spring配置 spring: -# config: -# activate: -# on-profile: druid - profiles: - active: druid # 资源信息 messages: # 国际化资源文件路径 basename: i18n/messages + profiles: + active: druid # 文件上传 servlet: - multipart: - # 单个文件大小 - max-file-size: 10MB - # 设置总上传的文件大小 - max-request-size: 20MB + multipart: + # 单个文件大小 + max-file-size: 10MB + # 设置总上传的文件大小 + max-request-size: 20MB # 服务模块 devtools: restart: @@ -69,9 +63,9 @@ spring: # 端口，默认为6379 port: 6379 # 数据库索引 - database: 3 + database: 0 # 密码 - password: sdust2020 + password: # 连接超时时间 timeout: 10s lettuce: @@ -87,44 +81,28 @@ spring: # token配置 token: - # 令牌自定义标识 - header: Authorization - # 令牌密钥 - secret: abcdefghijklmnopqrstuvwxyz - # 令牌有效期（默认30分钟） - expireTime: 300 - + # 令牌自定义标识 + header: Authorization + # 令牌密钥 + secret: abcdefghijklmnopqrstuvwxyz + # 令牌有效期（默认30分钟） + expireTime: 30 + # MyBatis配置 mybatis: - # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - -## 滑块验证码 -#aj: -# captcha: -# # 缓存类型 -# cache-type: redis -# # blockPuzzle 滑块 clickWord 文字点选 default默认两者都实例化 -# type: blockPuzzle -# # 右下角显示字 -# water-mark: ruoyi.vip -# # 校验滑动拼图允许误差偏移量(默认5像素) -# slip-offset: 5 -# # aes加密坐标开启或者禁用(true|false) -# aes-status: true -# # 滑动干扰项(0/1/2) -# interference-options: 2 - + # 搜索指定包别名 + typeAliasesPackage: com.ruoyi.**.domain + # 配置mapper的扫描，找到所有的mapper.xml映射文件 + mapperLocations: classpath*:mapper/**/*Mapper.xml + # 加载全局的配置文件 + configLocation: classpath:mybatis/mybatis-config.xml # PageHelper分页插件 -pagehelper: +pagehelper: helperDialect: mysql + reasonable: true supportMethodsArguments: true - params: count=countSql + params: count=countSql # Swagger配置 swagger: @@ -133,12 +111,26 @@ swagger: # 请求前缀 pathMapping: /dev-api +# 滑块验证码 +aj: + captcha: + cache-type: redis + # blockPuzzle 滑块 clickWord 文字点选 default默认两者都实例化 + type: blockPuzzle + # 右下角显示字 + water-mark: ruoyi.vip + # 校验滑动拼图允许误差偏移量(默认5像素) + slip-offset: 5 + # aes加密坐标开启或者禁用(true|false) + aes-status: true + # 滑动干扰项(0/1/2) + interference-options: 2 # 防止XSS攻击 xss: # 过滤开关 enabled: true # 排除链接（多个用逗号分隔） - excludes: /system/notice + excludes: /system/notice/* # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/WeatherUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/WeatherUtils.java new file mode 100644 index 000000000..a29f23031 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/WeatherUtils.java @@ -0,0 +1,66 @@ +package com.ruoyi.common.utils.file; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.*; +import java.util.Map; + +/** + * @Author: JinSheng Song + * @Date: 2022/6/10 9:17 + */ +public class WeatherUtils +{ + + + public static String httpRequest(String requestUrl,Map params) { + //buffer用于接受返回的字符 + StringBuffer buffer = new StringBuffer(); + try { + //建立URL，把请求地址给补全，其中urlencode（）方法用于把params里的参数给取出来 + URL url = new URL(requestUrl+"?"+urlencode(params)); + //打开http连接 + HttpURLConnection httpUrlConn = (HttpURLConnection) url.openConnection(); + httpUrlConn.setDoInput(true); + httpUrlConn.setRequestMethod("GET"); + httpUrlConn.connect(); + + //获得输入 + InputStream inputStream = httpUrlConn.getInputStream(); + InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "utf-8"); + BufferedReader bufferedReader = new BufferedReader(inputStreamReader); + + //将bufferReader的值给放到buffer里 + String str = null; + while ((str = bufferedReader.readLine()) != null) { + buffer.append(str); + } + //关闭bufferReader和输入流 + bufferedReader.close(); + inputStreamReader.close(); + inputStream.close(); + inputStream = null; + //断开连接 + httpUrlConn.disconnect(); + + } catch (Exception e) { + e.printStackTrace(); + } + //返回字符串 + return buffer.toString(); + } + + public static String urlencode(Mapdata) { + //将map里的参数变成像 showapi_appid=###&showapi_sign=###&的样子 + StringBuilder sb = new StringBuilder(); + for (Map.Entry i : data.entrySet()) { + try { + sb.append(i.getKey()).append("=").append(URLEncoder.encode(i.getValue()+"","UTF-8")).append("&"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + return sb.toString(); + } +} diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index fd4fa2e42..26f362e21 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -35,13 +35,13 @@ druid-spring-boot-starter - - - - - - + + + com.github.anji-plus + captcha-spring-boot-starter + 1.2.7 + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 58dd02ad0..793479b85 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -110,6 +110,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter .antMatchers("/swagger-ui.html").anonymous() .antMatchers("/swagger-resources/**").anonymous() .antMatchers("/webjars/**").anonymous() + .antMatchers("/login", "/captcha/get", "/captcha/check").permitAll() .antMatchers("/*/api-docs").anonymous() .antMatchers("/druid/**").anonymous() // 除上面外的所有请求全部需要鉴权认证 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/CaptchaRedisService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/CaptchaRedisService.java new file mode 100644 index 000000000..01e288b7a --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/CaptchaRedisService.java @@ -0,0 +1,53 @@ +package com.ruoyi.framework.web.service; + +import java.util.concurrent.TimeUnit; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import com.anji.captcha.service.CaptchaCacheService; + +/** + * 自定义redis验证码缓存实现类 + * + * @author ruoyi + */ +public class CaptchaRedisService implements CaptchaCacheService +{ + @Autowired + private StringRedisTemplate stringRedisTemplate; + + @Override + public void set(String key, String value, long expiresInSeconds) + { + stringRedisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS); + } + + @Override + public boolean exists(String key) + { + return stringRedisTemplate.hasKey(key); + } + + @Override + public void delete(String key) + { + stringRedisTemplate.delete(key); + } + + @Override + public String get(String key) + { + return stringRedisTemplate.opsForValue().get(key); + } + + @Override + public Long increment(String key, long val) + { + return stringRedisTemplate.opsForValue().increment(key, val); + } + + @Override + public String type() + { + return "redis"; + } +} \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 1f937ef75..09995d987 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -2,27 +2,27 @@ package com.ruoyi.framework.web.service; import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; +import com.anji.captcha.model.common.ResponseModel; +import com.anji.captcha.model.vo.CaptchaVO; +import com.anji.captcha.service.CaptchaService; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; import com.ruoyi.common.exception.user.UserPasswordNotMatchException; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ip.IpUtils; import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; /** @@ -39,14 +39,12 @@ public class SysLoginService @Resource private AuthenticationManager authenticationManager; - @Autowired - private RedisCache redisCache; - @Autowired private ISysUserService userService; @Autowired - private ISysConfigService configService; + @Lazy + private CaptchaService captchaService; /** * 登录验证 @@ -54,16 +52,18 @@ public class SysLoginService * @param username 用户名 * @param password 密码 * @param code 验证码 - * @param uuid 唯一标识 * @return 结果 */ - public String login(String username, String password, String code, String uuid) + public String login(String username, String password, String code) { - boolean captchaOnOff = configService.selectCaptchaOnOff(); - // 验证码开关 - if (captchaOnOff) + CaptchaVO captchaVO = new CaptchaVO(); + captchaVO.setCaptchaVerification(code); + ResponseModel response = captchaService.verification(captchaVO); + if (!response.isSuccess()) { - validateCaptcha(username, code, uuid); + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, + MessageUtils.message("user.jcaptcha.error"))); + throw new CaptchaException(); } // 用户验证 Authentication authentication = null; @@ -88,36 +88,10 @@ public class SysLoginService } AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); LoginUser loginUser = (LoginUser) authentication.getPrincipal(); - recordLoginInfo(loginUser.getUserId()); // 生成token return tokenService.createToken(loginUser); } - /** - * 校验验证码 - * - * @param username 用户名 - * @param code 验证码 - * @param uuid 唯一标识 - * @return 结果 - */ - public void validateCaptcha(String username, String code, String uuid) - { - String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); - String captcha = redisCache.getCacheObject(verifyKey); - redisCache.deleteObject(verifyKey); - if (captcha == null) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"))); - throw new CaptchaExpireException(); - } - if (!code.equalsIgnoreCase(captcha)) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"))); - throw new CaptchaException(); - } - } - /** * 记录登录信息 * @@ -131,4 +105,4 @@ public class SysLoginService sysUser.setLoginDate(DateUtils.getNowDate()); userService.updateUserProfile(sysUser); } -} +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java new file mode 100644 index 000000000..995efb013 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/CastsVo.java @@ -0,0 +1,110 @@ +package com.ruoyi.system.domain_yada; + +import java.time.LocalDate; + +/** + * @Author: JinSheng Song + * @Date: 2022/6/10 10:04 + */ +public class CastsVo +{ + private String date; + + private String week; + + private String dayweather; + + private String nightweather; + + private String daytemp; + + private String nighttemp; + + private String daywind; + + private String nightwind; + + private String daypower; + + private String nightpower; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public String getDayweather() { + return dayweather; + } + + public void setDayweather(String dayweather) { + this.dayweather = dayweather; + } + + public String getNightweather() { + return nightweather; + } + + public void setNightweather(String nightweather) { + this.nightweather = nightweather; + } + + public String getDaytemp() { + return daytemp; + } + + public void setDaytemp(String daytemp) { + this.daytemp = daytemp; + } + + public String getNighttemp() { + return nighttemp; + } + + public void setNighttemp(String nighttemp) { + this.nighttemp = nighttemp; + } + + public String getDaywind() { + return daywind; + } + + public void setDaywind(String daywind) { + this.daywind = daywind; + } + + public String getNightwind() { + return nightwind; + } + + public void setNightwind(String nightwind) { + this.nightwind = nightwind; + } + + public String getDaypower() { + return daypower; + } + + public void setDaypower(String daypower) { + this.daypower = daypower; + } + + public String getNightpower() { + return nightpower; + } + + public void setNightpower(String nightpower) { + this.nightpower = nightpower; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java new file mode 100644 index 000000000..3ca9773f8 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ForecastVo.java @@ -0,0 +1,62 @@ +package com.ruoyi.system.domain_yada; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * @Author: JinSheng Song + * @Date: 2022/6/10 10:02 + */ +public class ForecastVo { + + private String city; + + private String adcode; + + private String province; + + private String reporttime; + + private List casts; + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getAdcode() { + return adcode; + } + + public void setAdcode(String adcode) { + this.adcode = adcode; + } + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getReporttime() { + return reporttime; + } + + public void setReporttime(String reporttime) { + this.reporttime = reporttime; + } + + public List getCasts() { + return casts; + } + + public void setCasts(List casts) { + this.casts = casts; + } +} + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java new file mode 100644 index 000000000..6a5d3fefb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/LivesVo.java @@ -0,0 +1,110 @@ +package com.ruoyi.system.domain_yada; + +import java.time.LocalDateTime; + +/** + * @Author: JinSheng Song + * @Date: 2022/6/10 9:57 + */ +public class LivesVo +{ + /** + * 省份名 + */ + private String province; + /** + * 城市名 + */ + private String city; + /** + * 区域编码 + */ + private String adcode; + /** + *天气现象 + */ + private String weather; + + private String temperature; + + private String winddirection; + + private String windpower; + + private String humidity; + + private LocalDateTime reporttime; + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getAdcode() { + return adcode; + } + + public void setAdcode(String adcode) { + this.adcode = adcode; + } + + public String getWeather() { + return weather; + } + + public void setWeather(String weather) { + this.weather = weather; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getWinddirection() { + return winddirection; + } + + public void setWinddirection(String winddirection) { + this.winddirection = winddirection; + } + + public String getWindpower() { + return windpower; + } + + public void setWindpower(String windpower) { + this.windpower = windpower; + } + + public String getHumidity() { + return humidity; + } + + public void setHumidity(String humidity) { + this.humidity = humidity; + } + + public LocalDateTime getReporttime() { + return reporttime; + } + + public void setReporttime(LocalDateTime reporttime) { + this.reporttime = reporttime; + } + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java new file mode 100644 index 000000000..e7449cc81 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/WeatherUtilsVO.java @@ -0,0 +1,85 @@ +package com.ruoyi.system.domain_yada; + +import java.util.List; + +/** + * @Author: JinSheng Song + * @Date: 2022/6/10 9:53 + */ +public class WeatherUtilsVO { + /** + * 接口返回状态 + */ + private String status; + /** + * 返回结果数量 + */ + private String count; + + private String info; + + private String infocode; + /** + * 实时天气预报 + */ + private List lives; + /** + * 预报天气 + */ + private List forecasts; + +// /** +// * 预报天气 +// */ +// private String forecasts; + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getCount() { + return count; + } + + public void setCount(String count) { + this.count = count; + } + + public String getInfo() { + return info; + } + + public void setInfo(String info) { + this.info = info; + } + + public String getInfocode() { + return infocode; + } + + public void setInfocode(String infocode) { + this.infocode = infocode; + } + + + + public List getForecasts() { + return forecasts; + } + + public void setForecasts(List forecasts) { + this.forecasts = forecasts; + } + + public List getLives() { + return lives; + } + + public void setLives(List lives) { + this.lives = lives; + } +} From e9e8ea36b74ed46fef035b8ca0b9cdc692ab3c61 Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Thu, 16 Jun 2022 09:49:27 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/CaptchaController.java | 96 ------------------- ruoyi-framework/pom.xml | 20 ++-- .../ruoyi/framework/config/CaptchaConfig.java | 83 ---------------- .../framework/config/KaptchaTextCreator.java | 75 --------------- 4 files changed, 10 insertions(+), 264 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java delete mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java delete mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java deleted file mode 100644 index 39b32ef3e..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.web.controller.common; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.concurrent.TimeUnit; -import javax.annotation.Resource; -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; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.redis.RedisCache; -import com.ruoyi.common.utils.sign.Base64; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.system.service.ISysConfigService; - -/** - * 验证码操作处理 - * - * @author ruoyi - */ -@RestController -public class CaptchaController -{ - @Resource(name = "captchaProducer") - private Producer captchaProducer; - - @Resource(name = "captchaProducerMath") - private Producer captchaProducerMath; - - @Resource - private RedisCache redisCache; - - @Resource - private ISysConfigService configService; - /** - * 生成验证码 - */ - @GetMapping("/captchaImage") - public AjaxResult getCode(HttpServletResponse response) throws IOException - { - AjaxResult ajax = AjaxResult.success(); - boolean captchaOnOff = configService.selectCaptchaOnOff(); - ajax.put("captchaOnOff", captchaOnOff); - if (!captchaOnOff) - { - return ajax; - } - - // 保存验证码信息 - String uuid = IdUtils.simpleUUID(); - String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; - - String capStr = null, code = null; - BufferedImage image = null; - - // 生成验证码 - String captchaType = RuoYiConfig.getCaptchaType(); - if ("math".equals(captchaType)) - { - String capText = captchaProducerMath.createText(); - capStr = capText.substring(0, capText.lastIndexOf("@")); - code = capText.substring(capText.lastIndexOf("@") + 1); - image = captchaProducerMath.createImage(capStr); - } - else if ("char".equals(captchaType)) - { - capStr = code = captchaProducer.createText(); - image = captchaProducer.createImage(capStr); - } - - redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); - // 转换流信息写出 - FastByteArrayOutputStream os = new FastByteArrayOutputStream(); - try - { - ImageIO.write(image, "jpg", os); - } - catch (IOException e) - { - return AjaxResult.error(e.getMessage()); - } - - ajax.put("uuid", uuid); - ajax.put("img", Base64.encode(os.toByteArray())); - return ajax; - } -} diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 26f362e21..8a18c2b25 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -44,16 +44,16 @@ - - com.github.penggle - kaptcha - - - javax.servlet-api - javax.servlet - - - + + + + + + + + + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java deleted file mode 100644 index 43e78aebe..000000000 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.ruoyi.framework.config; - -import java.util.Properties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import com.google.code.kaptcha.impl.DefaultKaptcha; -import com.google.code.kaptcha.util.Config; -import static com.google.code.kaptcha.Constants.*; - -/** - * 验证码配置 - * - * @author ruoyi - */ -@Configuration -public class CaptchaConfig -{ - @Bean(name = "captchaProducer") - public DefaultKaptcha getKaptchaBean() - { - DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); - Properties properties = new Properties(); - // 是否有边框 默认为true 我们可以自己设置yes，no - properties.setProperty(KAPTCHA_BORDER, "yes"); - // 验证码文本字符颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black"); - // 验证码图片宽度 默认为200 - properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); - // 验证码图片高度 默认为50 - properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); - // 验证码文本字符大小 默认为40 - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38"); - // KAPTCHA_SESSION_KEY - properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode"); - // 验证码文本字符长度 默认为5 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4"); - // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); - // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy - properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); - Config config = new Config(properties); - defaultKaptcha.setConfig(config); - return defaultKaptcha; - } - - @Bean(name = "captchaProducerMath") - public DefaultKaptcha getKaptchaBeanMath() - { - DefaultKaptcha defaultKaptcha = new DefaultKaptcha(); - Properties properties = new Properties(); - // 是否有边框 默认为true 我们可以自己设置yes，no - properties.setProperty(KAPTCHA_BORDER, "yes"); - // 边框颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90"); - // 验证码文本字符颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue"); - // 验证码图片宽度 默认为200 - properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160"); - // 验证码图片高度 默认为50 - properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60"); - // 验证码文本字符大小 默认为40 - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35"); - // KAPTCHA_SESSION_KEY - properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); - // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator"); - // 验证码文本字符间距 默认为2 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); - // 验证码文本字符长度 默认为5 - properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6"); - // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize) - properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier"); - // 验证码噪点颜色 默认为Color.BLACK - properties.setProperty(KAPTCHA_NOISE_COLOR, "white"); - // 干扰实现类 - properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise"); - // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy - properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy"); - Config config = new Config(properties); - defaultKaptcha.setConfig(config); - return defaultKaptcha; - } -} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java deleted file mode 100644 index 3e7458003..000000000 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.ruoyi.framework.config; - -import java.util.Random; -import com.google.code.kaptcha.text.impl.DefaultTextCreator; - -/** - * 验证码文本生成器 - * - * @author ruoyi - */ -public class KaptchaTextCreator extends DefaultTextCreator -{ - private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(","); - - @Override - public String getText() - { - Integer result = 0; - Random random = new Random(); - int x = random.nextInt(10); - int y = random.nextInt(10); - StringBuilder suChinese = new StringBuilder(); - int randomoperands = (int) Math.round(Math.random() * 2); - if (randomoperands == 0) - { - result = x * y; - suChinese.append(CNUMBERS[x]); - suChinese.append("*"); - suChinese.append(CNUMBERS[y]); - } - else if (randomoperands == 1) - { - if (!(x == 0) && y % x == 0) - { - result = y / x; - suChinese.append(CNUMBERS[y]); - suChinese.append("/"); - suChinese.append(CNUMBERS[x]); - } - else - { - result = x + y; - suChinese.append(CNUMBERS[x]); - suChinese.append("+"); - suChinese.append(CNUMBERS[y]); - } - } - else if (randomoperands == 2) - { - if (x >= y) - { - result = x - y; - suChinese.append(CNUMBERS[x]); - suChinese.append("-"); - suChinese.append(CNUMBERS[y]); - } - else - { - result = y - x; - suChinese.append(CNUMBERS[y]); - suChinese.append("-"); - suChinese.append(CNUMBERS[x]); - } - } - else - { - result = x + y; - suChinese.append(CNUMBERS[x]); - suChinese.append("+"); - suChinese.append(CNUMBERS[y]); - } - suChinese.append("=?@" + result); - return suChinese.toString(); - } -} \ No newline at end of file From 3006b3c751eddb7acbb6be85d6615c0d77f83d9b Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Thu, 16 Jun 2022 09:49:49 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E5=A2=9E=E5=8A=A0redis=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index fbf3866ad..e095e222b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -65,7 +65,7 @@ spring: # 数据库索引 database: 0 # 密码 - password: + password: sdust2020 # 连接超时时间 timeout: 10s lettuce: From 6148ca9ae8c8df495f80080bb7216741a3ec929d Mon Sep 17 00:00:00 2001 From: qdxkrs <39894542+qdxkrs@users.noreply.github.com> Date: Thu, 16 Jun 2022 10:50:51 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com.anji.captcha.service.CaptchaCacheService | 0 .../main/java/com/ruoyi/framework/config/SecurityConfig.java | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename ruoyi-admin/src/main/resources/META-INF/{ => services}/com.anji.captcha.service.CaptchaCacheService (100%) diff --git a/ruoyi-admin/src/main/resources/META-INF/com.anji.captcha.service.CaptchaCacheService b/ruoyi-admin/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService similarity index 100% rename from ruoyi-admin/src/main/resources/META-INF/com.anji.captcha.service.CaptchaCacheService rename to ruoyi-admin/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 793479b85..cdcff26ec 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -97,7 +97,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // 过滤请求 .authorizeRequests() // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - .antMatchers("/login", "/register", "/captchaImage").anonymous() +// .antMatchers("/login", "/register", "/captchaImage").anonymous() + .antMatchers("/login", "/register", "/captcha/get", "/captcha/check").permitAll() .antMatchers( HttpMethod.GET, "/", From fafe483b531c820da4c57e1a284e77ca6fd0a5ea Mon Sep 17 00:00:00 2001 From: songjinsheng Date: Thu, 16 Jun 2022 11:58:56 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SysLogininforMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 26d51fa39..cb4441247 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time) - values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate()) + values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, current_timestamp) - SELECT FROM forest_coverage; + SELECT FROM forest_coverage + WHERE 1=1 + + AND particular_year = #{particularYear} + + + AND region = #{typeName} + + + diff --git a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml index 4078d0dbb..477653950 100644 --- a/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/AustraliaMiddleEastMapper.xml @@ -24,7 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -44,8 +51,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" created_by , created_time ) VALUES ( - #{yearMonth,jdbcType=INTEGER}, - #{month,jdbcType=INTEGER}, + #{yearMonth,jdbcType=VARCHAR}, + #{month,jdbcType=VARCHAR}, #{sstAnomalyIndex,jdbcType=DOUBLE}, #{temperatureAnomolies,jdbcType=DOUBLE}, #{precipitationAnomolies,jdbcType=DOUBLE}, diff --git a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml index ddd304cf8..d4484da00 100644 --- a/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/OceanTemperatureMapper.xml @@ -23,6 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml index 97a102cd7..e85eed99a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionVGIMapper.xml @@ -25,7 +25,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml index 0a0b01c82..e3d7b6fc7 100644 --- a/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/RegionalSystemMapper.xml @@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml index 5f796b70f..a78000435 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml @@ -14,7 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -27,7 +26,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml index 779198a65..58e3e1be8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml @@ -23,6 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml index df3dd9245..6dc1a200e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/VegetationCoverageMapper.xml @@ -25,6 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"