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 000000000..c1dd12f17 Binary files /dev/null and b/demo/.mvn/wrapper/maven-wrapper.jar differ 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