Merge remote-tracking branch 'origin/master'

shiwan/common/.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/

shiwan/common/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed 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.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+            + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if (mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if (mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if (!outputFile.getParentFile().exists()) {
+            if (!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

shiwan/common/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

shiwan/common/mvnw

@@ -0,0 +1,322 @@
+#!/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 /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="$(which 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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+  else
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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"
+    else
+      wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

shiwan/common/mvnw.cmd

@@ -0,0 +1,182 @@
+@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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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%
+
+exit /B %ERROR_CODE%

shiwan/common/pom.xml

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

shiwan/common/src/main/java/com/huimv/common/utils/DateUtil.java

@@ -0,0 +1,69 @@
+package com.huimv.common.utils;
+
+import javax.management.MXBean;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+public class DateUtil {
+
+    /**
+     * @Method      : getToday
+     * @Description : 
+     * @Params      : []
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/28       
+     * @Time        : 16:41
+     */
+    public String getToday(){
+        DateFormat df3 = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.CHINA);
+        return df3.format(new Date());
+    }
+
+    /**
+     * @Method      : 格式化日期
+     * @Description : 
+     * @Params      : [date]
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/28       
+     * @Time        : 17:25
+     */
+    public String formatDate(Date date){
+        DateFormat df3 = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.CHINA);
+        return df3.format(date);
+    }
+
+    /**
+     * @Method      : beforeTime
+     * @Description : 
+     * @Params      : [times]
+     * @Return      : java.lang.String
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29       
+     * @Time        : 14:34
+     */
+    public String beforeTime(int times){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
+        Calendar calendar = Calendar.getInstance();
+        //（3）计算推前n小时的时间，16为推前16小时
+        calendar.set(Calendar.HOUR_OF_DAY, calendar.get(Calendar.HOUR_OF_DAY) - times);
+        String endTime = sdf.format(calendar.getTime());
+        System.out.println("提前3小时："+ endTime);
+        return endTime;
+    }
+}

shiwan/common/src/main/java/com/huimv/common/utils/Result.java

@@ -0,0 +1,79 @@
+package com.huimv.common.utils;
+
+import java.io.Serializable;
+
+public class Result implements Serializable {
+
+    private boolean success;
+    private Integer code;
+    private String message;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    private Object data;
+
+    //不需要返回数据时使用
+    public Result(ResultCode code) {
+        this.success = code.success;
+        this.code = code.code;
+        this.message = code.message;
+    }
+
+    public Result(ResultCode code, Object data) {
+        this.success = code.success;
+        this.code = code.code;
+        this.message = code.message;
+        this.data = data;
+    }
+
+    public Result(Integer code, String message, boolean success) {
+        this.code = code;
+        this.message = message;
+        this.success = success;
+    }
+
+    /*
+     * 调用ResultCode类封装常用的返回数据
+     */
+    public static Result SUCCESS(){
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    public static Result ERROR(){
+        return new Result(ResultCode.SERVER_ERROR);
+    }
+
+    public static Result FAIL(){
+        return new Result(ResultCode.FAIL);
+    }
+}

shiwan/common/src/main/java/com/huimv/common/utils/ResultCode.java

@@ -0,0 +1,41 @@
+package com.huimv.common.utils;
+
+public enum ResultCode {
+    SUCCESS(true,10000,"操作成功！"),
+    //---系统错误返回码-----
+    FAIL(false,10001,"操作失败"),
+    UNAUTHENTICATED(false,10002,"您还未登录"),
+    UNAUTHORISE(false,10003,"权限不足"),
+    SERVER_ERROR(false,99999,"抱歉，系统繁忙，请稍后重试！"),
+
+    //---用户操作返回码  2xxxx----
+    MOBILEORPASSWORDERROR(false,20001,"用户名或密码错误");
+    //---企业操作返回码  3xxxx----
+    //---权限操作返回码----
+    //---其他操作返回码----
+
+    //操作是否成功
+    boolean success;
+    //操作代码
+    int code;
+    //提示信息
+    String message;
+
+    ResultCode(boolean success,int code, String message){
+        this.success = success;
+        this.code = code;
+        this.message = message;
+    }
+
+    public boolean success() {
+        return success;
+    }
+
+    public int code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+}

shiwan/env/pom.xml

@@ -2,20 +2,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+<!--    <parent>-->
+<!--        <groupId>com.huimv</groupId>-->
+<!--        <artifactId>shiwan</artifactId>-->
+<!--        <version>0.0.1-SNAPSHOT</version>-->
+<!--        <relativePath>../my-parent</relativePath>-->
+<!--    </parent>-->
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.1</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>com.huimv</groupId>
+        <artifactId>shiwan</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
     </parent>
-    <groupId>com.huimv</groupId>
+
     <artifactId>env</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>env</name>
     <description>Demo project for Spring Boot</description>
 
+    <!-- 定义版本号 -->
     <properties>
         <java.version>1.8</java.version>
+        <dynamic.version>2.4.2</dynamic.version>
     </properties>
 
     <dependencies>
@@ -29,6 +36,31 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>${dynamic.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

shiwan/env/src/main/java/com/huimv/env/controller/EnvironmentController.java

@@ -4,10 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.huimv.common.utils.Result;
 import com.huimv.env.service.IEnvironmentService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @Project : huimv.shiwan
@@ -68,7 +65,7 @@ public class EnvironmentController {
      * @Date        : 2020/12/28       
      * @Time        : 20:48
      */
-    @RequestMapping("/getZsda")
+    @RequestMapping(value="/getZsda",method = RequestMethod.GET)
     public Result getZsda(@RequestParam(value = "mcid") Integer mcid){
         //
         return environmentService.getZsda(mcid);
@@ -84,11 +81,30 @@ public class EnvironmentController {
      * @Date        : 2020/12/28       
      * @Time        : 20:51
      */
-    @RequestMapping("/getLastEnvByLq")
+    @RequestMapping(value="/getLastEnvByLq",method = RequestMethod.GET)
     public Result getLastEnvByLq(@RequestParam(value = "lqid") Integer lqid){
         //
         return environmentService.getLastEnvByLq(lqid);
     }
 
+    @RequestMapping(value="/getTemperature",method = RequestMethod.GET)
+    public Result getTemperature(@RequestParam(value = "lqid") Integer lqid){
+        // 获取
+        return environmentService.getTemperatureOnToday(lqid);
+    }
+
+    @RequestMapping(value="/getAmmoniaAndHumidity",method = RequestMethod.GET)
+    public Result getAmmoniaAndHumidity(@RequestParam(value = "lqid") Integer lqid){
+
+        return environmentService.getAmmoniaAndHumidityOnToday(lqid);
+    }
+
+    @RequestMapping("/details")
+    public Result getEnvDetails() {
+        // 获取环保数据
+        return environmentService.getEnvDetails();
+    }
+
+
 
 }

shiwan/env/src/main/java/com/huimv/env/dao/entity/EnvironmentDataEntity.java

@@ -0,0 +1,176 @@
+package com.huimv.env.dao.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "environment_data")
+public class EnvironmentDataEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "ad")
+    private String ad;
+
+    @Column(name = "date", nullable = false)
+    private String date;
+
+    @Column(name = "date_time")
+    private String dateTime;
+
+    @Column(name = "hour")
+    private Integer hour;
+
+    @Column(name = "hxxyl")
+    private String hxxyl;
+
+    @Column(name = "ph")
+    private String ph;
+
+    @Column(name = "qn")
+    private String qn;
+
+    @Column(name = "write_time")
+    private Timestamp writeTime;
+
+    @Column(name = "ws")
+    private Float ws;
+
+    @Column(name = "wslj")
+    private Float wslj;
+
+    @Column(name = "zd")
+    private String zd;
+
+    @Column(name = "zl")
+    private String zl;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setAd(String ad) {
+        this.ad = ad;
+    }
+
+    public String getAd() {
+        return ad;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDateTime(String dateTime) {
+        this.dateTime = dateTime;
+    }
+
+    public String getDateTime() {
+        return dateTime;
+    }
+
+    public void setHour(Integer hour) {
+        this.hour = hour;
+    }
+
+    public Integer getHour() {
+        return hour;
+    }
+
+    public void setHxxyl(String hxxyl) {
+        this.hxxyl = hxxyl;
+    }
+
+    public String getHxxyl() {
+        return hxxyl;
+    }
+
+    public void setPh(String ph) {
+        this.ph = ph;
+    }
+
+    public String getPh() {
+        return ph;
+    }
+
+    public void setQn(String qn) {
+        this.qn = qn;
+    }
+
+    public String getQn() {
+        return qn;
+    }
+
+    public void setWriteTime(Timestamp writeTime) {
+        this.writeTime = writeTime;
+    }
+
+    public Timestamp getWriteTime() {
+        return writeTime;
+    }
+
+    public void setWs(Float ws) {
+        this.ws = ws;
+    }
+
+    public Float getWs() {
+        return ws;
+    }
+
+    public void setWslj(Float wslj) {
+        this.wslj = wslj;
+    }
+
+    public Float getWslj() {
+        return wslj;
+    }
+
+    public void setZd(String zd) {
+        this.zd = zd;
+    }
+
+    public String getZd() {
+        return zd;
+    }
+
+    public void setZl(String zl) {
+        this.zl = zl;
+    }
+
+    public String getZl() {
+        return zl;
+    }
+
+    @Override
+    public String toString() {
+        return "EnvironmentDataEntity{" +
+                "id=" + id + '\'' +
+                "ad=" + ad + '\'' +
+                "date=" + date + '\'' +
+                "dateTime=" + dateTime + '\'' +
+                "hour=" + hour + '\'' +
+                "hxxyl=" + hxxyl + '\'' +
+                "ph=" + ph + '\'' +
+                "qn=" + qn + '\'' +
+                "writeTime=" + writeTime + '\'' +
+                "ws=" + ws + '\'' +
+                "wslj=" + wslj + '\'' +
+                "zd=" + zd + '\'' +
+                "zl=" + zl + '\'' +
+                '}';
+    }
+}

shiwan/env/src/main/java/com/huimv/env/dao/repo/EnvironmentDataEntityRepository.java

@@ -0,0 +1,12 @@
+package com.huimv.env.dao.repo;
+
+import com.huimv.env.dao.entity.EnvironmentDataEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+public interface EnvironmentDataEntityRepository extends JpaRepository<EnvironmentDataEntity, Integer>, JpaSpecificationExecutor<EnvironmentDataEntity> {
+
+    @Query(nativeQuery = true, value = "select * from environment_data order by id desc limit 1")
+    EnvironmentDataEntity getOneLastEnvData();
+}

shiwan/env/src/main/java/com/huimv/env/dao/repo/SjHkAqEntityRepository.java

@@ -13,6 +13,12 @@ public interface SjHkAqEntityRepository extends JpaRepository<SjHkAqEntity, Inte
     List<SjHkAqEntity> getLastAq(List<Integer> lqids,String todayDate);
 
 //    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE lqid=?1 AND function(\"date_format\",CJSJ,\"%Y-%m-%d\")=?2 ORDER BY cjsj DESC LIMIT 0,1)")
-    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE lqid=?1 AND date_format(CJSJ,'%Y-%m-%d')=?2 ORDER BY cjsj DESC LIMIT 0,1")
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,CJSJ,SCSJ FROM sj_hk_aq WHERE lqid=?1 AND date_format(CJSJ,'%Y-%m-%d')= DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
     SjHkAqEntity getLastAq(Integer lqid,String todayDate);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,SCSJ,CJSJ FROM sj_hk_aq WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
+    List<SjHkAqEntity> getAmmoniaOnToday(Integer lqid, String beforeDateTime);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqaq,SCSJ,CJSJ FROM sj_hk_aq WHERE lqid=?1 ORDER BY cjsj DESC LIMIT 10")
+    List<SjHkAqEntity> getAmmonia(Integer lqid, String beforeDateTime);
 }

shiwan/env/src/main/java/com/huimv/env/dao/repo/SjHkSdEntityRepository.java

@@ -13,6 +13,12 @@ public interface SjHkSdEntityRepository extends JpaRepository<SjHkSdEntity, Inte
     @Query(nativeQuery = true , value = "SELECT ID,LQID,CGQID,DQSD,CJSJ,SCSJ FROM sj_hk_sd WHERE id IN( SELECT MAX(id) FROM sj_hk_sd WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2  GROUP BY lqid)")
     List<SjHkSdEntity> getLastSd(List lqidList,String date);
 
-    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,CJSJ,SCSJ FROM sj_hk_sd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2 ORDER BY cjsj DESC LIMIT 0,1")
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,CJSJ,SCSJ FROM sj_hk_sd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
     SjHkSdEntity getLastSd(Integer lqid, String todayDate);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,SCSJ,CJSJ FROM sj_hk_sd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
+    List<SjHkSdEntity> getHumidityOnToday(Integer lqid, String beforeDateTime);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqsd,SCSJ,CJSJ FROM sj_hk_sd WHERE lqid=?1 ORDER BY cjsj DESC limit 10")
+    List<SjHkSdEntity> getHumidity(Integer lqid, String beforeDateTime);
 }

shiwan/env/src/main/java/com/huimv/env/dao/repo/SjHkWdEntityRepository.java

@@ -14,6 +14,23 @@ public interface SjHkWdEntityRepository extends JpaRepository<SjHkWdEntity, Inte
     @Query(nativeQuery = true , value = "SELECT id,lqid,cgqid,dqwd,cjsj,scsj FROM sj_hk_wd WHERE id IN(SELECT MAX(id) FROM sj_hk_wd WHERE lqid IN(?1) AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2  GROUP BY lqid)")
     List<SjHkWdEntity> getLastWd(List lqidList,String date);
 
-    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,CJSJ,SCSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2 ORDER BY cjsj DESC LIMIT 0,1")
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,CJSJ,SCSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=DATE_FORMAT(?2,'%Y-%m-%d') ORDER BY cjsj DESC LIMIT 0,1")
     SjHkWdEntity getLastWd(Integer lqid, String todayDate);
+
+    /**
+     * @Method      : getTemperatureOnToday
+     * @Description : 获取今天的温度
+     * @Params      : [lqid, todayDate]
+     * @Return      : com.huimv.env.dao.entity.SjHkWdEntity
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29       
+     * @Time        : 13:31
+     */
+//    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d')=?2 ORDER BY cjsj DESC ")
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 AND DATE_FORMAT(CJSJ,'%Y-%m-%d %H:%i:%s')>=DATE_FORMAT(?2,'%Y-%m-%d %H:%i:%s') ORDER BY cjsj ASC ")
+    List<SjHkWdEntity> getTemperatureOnToday(Integer lqid, String todayDate);
+
+    @Query(nativeQuery = true , value = "SELECT id,CGQID,lqid,dqwd,SCSJ,CJSJ FROM sj_hk_wd WHERE lqid=?1 ORDER BY cjsj DESC LIMIT 30")
+    List<SjHkWdEntity> getTemperature(Integer lqid, String beforeDateTime);
 }

shiwan/env/src/main/java/com/huimv/env/service/IEnvironmentService.java

@@ -29,4 +29,10 @@ public interface IEnvironmentService {
     Result getZsda(int mcid);
 
     Result getLastEnvByLq(Integer lqid);
+
+    Result getTemperatureOnToday(Integer lqid);
+
+    Result getAmmoniaAndHumidityOnToday(Integer lqid);
+
+    Result getEnvDetails();
 }

shiwan/env/src/main/java/com/huimv/env/service/impl/EnvironmentServiceImpl.java

@@ -38,7 +38,19 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
     private SjHkSdEntityRepository sdEntityRepo;
     @Autowired
     private SjHkWdEntityRepository wdEntityRepo;
+    @Autowired
+    private EnvironmentDataEntityRepository environmentDataRepo;
 
+    /**
+     * @Method      : getLastEnvData
+     * @Description : 
+     * @Params      : [mcid]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29       
+     * @Time        : 13:29
+     */
     @Override
     @DS("slave")
     public Result getLastEnvData(int mcid) {
@@ -173,7 +185,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
 //        System.out.println("栏期length>>"+lqdaEntityList.size());
         if (lqdaEntityList.size() == 0) {
             //返回出错.
-            return new Result(10002, "这个牧场(" + mcid + ")中的猪舍暂无相关任何栏期", false);
+            return new Result(10002, "这个牧场(" + mcid + ")中的猪舍暂未设置相关栏期", false);
         }
         List lqidList = new ArrayList();
         for (DaLqdaEntity lqdaEntity : lqdaEntityList) {
@@ -200,6 +212,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
             JSONObject envJo = new JSONObject();
             envJa.add(envJo);
             envJo.put("id",zsdaEntity.getID());
+            envJo.put("lqid",lqid);
             envJo.put("zsmc",zsdaEntity.getZSMC());
             //--读取最新氨气
             SjHkAqEntity aqEntity = aqEntityRepo.getLastAq(lqid, todayDate);
@@ -273,7 +286,7 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
             zsJo.put("zsmc", zsdaEntity.getZSMC());
             for (DaLqdaEntity lqdaEntity : lqdaEntityList) {
                 if (lqdaEntity.getZSID() == zsid) {
-                    zsJo.put("lqid", zsdaEntity.getID());
+                    zsJo.put("lqid", lqdaEntity.getID());
                     break;
                 }
             }
@@ -295,9 +308,9 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
     @DS("slave")
     public Result getLastEnvByLq(Integer lqid) {
         String todayDate = new DateUtil().formatDate(new Date());
-//        JSONArray envJa = new JSONArray();
+        System.out.println(" todayDate>>"+todayDate);
+        System.out.println(" lqid>>"+lqid);
         JSONObject envJo = new JSONObject();
-//        envJa.add(envJo);
         envJo.put("lqid",lqid);
         //--读取最新氨气
         SjHkAqEntity aqEntity = aqEntityRepo.getLastAq(lqid, todayDate);
@@ -324,5 +337,117 @@ public class EnvironmentServiceImpl implements IEnvironmentService {
         return new Result(ResultCode.SUCCESS, envJo);
     }
 
+    /**
+     * @Method      : getTemperatureOnToday
+     * @Description : 获取今天温度
+     * @Params      : [lqid]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29       
+     * @Time        : 13:29
+     */
+    @Override
+    @DS("slave")
+    public Result getTemperatureOnToday(Integer lqid) {
+        String beforeDateTime = new DateUtil().beforeTime(1);
+        JSONObject dataJo = new JSONObject();
+        //--读取最新温度
+//        List<SjHkWdEntity> wdEntityList = wdEntityRepo.getTemperatureOnToday(lqid, beforeDateTime);
+        List<SjHkWdEntity> wdEntityList = wdEntityRepo.getTemperature(lqid, beforeDateTime);
+        List<SjHkWdEntity> newList = new ArrayList();
+        for(int a=wdEntityList.size()-1;a>=0;a--){
+            SjHkWdEntity wdEntity = wdEntityList.get(a);
+            newList.add(wdEntity);
+        }
+        if (newList.size()>0) {
+            JSONArray tempJa = new JSONArray();
+            JSONArray timeJa = new JSONArray();
+            for(SjHkWdEntity wdEntity: newList){
+                System.out.println(""+wdEntity.getCJSJ()+","+wdEntity.getDQWD());
+                String dateTime = wdEntity.getCJSJ().toString();
+                String hourAndMin =  dateTime.substring(11,16);
+                timeJa.add(hourAndMin);
+                tempJa.add(wdEntity.getDQWD());
+            }
+            dataJo.put("timeData",timeJa);
+            dataJo.put("wenduList",tempJa);
+        }
+        return new Result(ResultCode.SUCCESS, dataJo);
+    }
+
+    /**
+     * @Method      : getAmmoniaAndHumidityOnToday
+     * @Description : 获取今天氨气和湿度
+     * @Params      : [lqid]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2020/12/29       
+     * @Time        : 13:28
+     */
+    @Override
+    @DS("slave")
+    public Result getAmmoniaAndHumidityOnToday(Integer lqid) {
+        String beforeDateTime = new DateUtil().beforeTime(3);
+        JSONArray timeJa = new JSONArray();
+        JSONObject dataJo = new JSONObject();
+        System.out.println("lqid>>"+lqid);
+        System.out.println("beforeDateTime>>"+beforeDateTime);
+        //--读取最新氨气
+//        List<SjHkAqEntity> aqEntityList = aqEntityRepo.getAmmoniaOnToday(lqid, beforeDateTime);
+        List<SjHkAqEntity> aqEntityList = aqEntityRepo.getAmmonia(lqid, beforeDateTime);
+        System.out.println("读取最新氨气>>"+aqEntityList.size());
+        List<SjHkAqEntity> newList = new ArrayList();
+        for(int a=aqEntityList.size()-1;a>=0;a--){
+            SjHkAqEntity aqEntity = aqEntityList.get(a);
+            newList.add(aqEntity);
+        }
+        System.out.println("读取最新氨气 newList>>"+newList.size());
+
+        if (newList.size()>0) {
+            JSONArray ammoniaJa = new JSONArray();
+            for(SjHkAqEntity aqEntity:newList){
+                String dateTime = aqEntity.getCJSJ().toString();
+                String hourAndMin =  dateTime.substring(11,16);
+                timeJa.add(hourAndMin);
+                ammoniaJa.add(aqEntity.getDQAQ());
+            }
+            dataJo.put("timeData",timeJa);
+            dataJo.put("anqiList",ammoniaJa);
+        }
+        //--读取最新湿度
+//        List<SjHkSdEntity> sdEntityList = sdEntityRepo.getHumidityOnToday(lqid, beforeDateTime);
+        List<SjHkSdEntity> sdEntityList = sdEntityRepo.getHumidity(lqid, beforeDateTime);
+        System.out.println("读取最新氨气>>"+sdEntityList.size());
+        List<SjHkSdEntity> newList2 = new ArrayList();
+        for(int a=sdEntityList.size()-1;a>=0;a--){
+            SjHkSdEntity sdEntity = sdEntityList.get(a);
+            newList2.add(sdEntity);
+        }
+        System.out.println("读取最新氨气 newList2>>"+newList2.size());
+        if (newList2.size()>0) {
+            JSONArray humidityJa = new JSONArray();
+            for(SjHkSdEntity sdEntity:newList2){
+                humidityJa.add(sdEntity.getDQSD());
+            }
+            dataJo.put("shiduList",humidityJa);
+        }
+        return new Result(ResultCode.SUCCESS, dataJo);
+    }
+
+    @Override
+    @DS("third")
+    public Result getEnvDetails() {
+        /**  */
+        EnvironmentDataEntity environmentData = environmentDataRepo.getOneLastEnvData();
+        System.out.println("environmentData:" + environmentData);
+        if (environmentData == null) {
+            return new Result(10003,"没有环控数据",false);
+        } else {
+            return new Result(ResultCode.SUCCESS,environmentData);
+        }
+    }
+
 
 }

shiwan/env/src/main/resources/application-prod.yml

@@ -34,7 +34,7 @@ spring:
             initial-size: 5
         slave:
           url: jdbc:mysql://122.112.219.87:3306/ifm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-          username: huimv
+          username: root
           password: hm123456
           driver-class-name: com.mysql.cj.jdbc.Driver
           druid:

shiwan/env/src/main/resources/application-test.yml

@@ -9,23 +9,32 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://192.168.1.7:3306/env_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://122.112.250.26:3306/env_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
           username: root
           password: hm123456
           driver-class-name: com.mysql.cj.jdbc.Driver
-          max-active: 20
-          max-idle: 8
-          min-idle: 8
-          initial-size: 10
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
         slave:
           url: jdbc:mysql://122.112.219.87:3306/ifm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
           username: huimv
           password: hm123456
           driver-class-name: com.mysql.cj.jdbc.Driver
-          max-active: 20
-          max-idle: 8
-          min-idle: 8
-          initial-size: 10
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
+        third:
+          url: jdbc:mysql://121.36.134.218:3306/device_db?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+          username: root
+          password: hm123456
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          max-active: 5
+          max-idle: 5
+          min-idle: 3
+          initial-size: 3
   jpa:
     show-sql: true
     database: mysql

shiwan/face/face.iml

@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <setting name="provider-name" value="Hibernate" />
+        <datasource-mapping>
+          <factory-entry name="entityManagerFactory" />
+        </datasource-mapping>
+        <naming-strategy-map />
+      </configuration>
+    </facet>
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
@@ -10,19 +20,11 @@
         <sourceRoots>
           <root url="file://$MODULE_DIR$/src/main/java" />
           <root url="file://$MODULE_DIR$/src/main/resources" />
+          <root url="file://$MODULE_DIR$/../src/main/java" />
+          <root url="file://$MODULE_DIR$/../src/main/resources" />
         </sourceRoots>
       </configuration>
     </facet>
-    <facet type="jpa" name="JPA">
-      <configuration>
-        <setting name="validation-enabled" value="true" />
-        <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping>
-          <factory-entry name="entityManagerFactory" value="33699a44-0673-4955-928d-c9a60d98b222" />
-        </datasource-mapping>
-        <naming-strategy-map />
-      </configuration>
-    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
@@ -33,6 +35,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
+    <content url="file://$MODULE_DIR$/../src/main/java">
+      <sourceFolder url="file://$MODULE_DIR$/../src/main/java" isTestSource="false" />
+    </content>
+    <content url="file://$MODULE_DIR$/../src/main/resources">
+      <sourceFolder url="file://$MODULE_DIR$/../src/main/resources" type="java-resource" />
+    </content>
+    <content url="file://$MODULE_DIR$/../src/test/java">
+      <sourceFolder url="file://$MODULE_DIR$/../src/test/java" isTestSource="true" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.4.1" level="project" />
@@ -46,7 +57,6 @@
     <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.4.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.3" level="project" />
@@ -58,8 +68,6 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.41" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.2" level="project" />
@@ -123,5 +131,27 @@
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.24" level="project" />
     <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:7.3.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.78" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.10.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.10.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.inject:guice:no_aop:4.2.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:25.1-android" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
   </component>
 </module>

shiwan/face/pom.xml

@@ -29,16 +29,19 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
             <version>2.3.1.RELEASE</version>
         </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.16</version>
         </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -49,6 +52,32 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>
@@ -60,4 +89,9 @@
         </plugins>
     </build>
 
+
+
+
+
+
 </project>

shiwan/face/src/main/java/com/huimv/face/FaceApplication.java

@@ -8,6 +8,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 public class FaceApplication {
 
+
     public static void main(String[] args) {
         SpringApplication.run(FaceApplication.class, args);
     }

shiwan/face/src/main/java/com/huimv/face/controller/FaceUserController.java

@@ -1,7 +1,9 @@
 package com.huimv.face.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.huimv.face.domain.*;
+import com.huimv.face.repo.FaceUserImgRepository;
 import com.huimv.face.result.Result;
 import com.huimv.face.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -162,6 +164,7 @@ public class FaceUserController {
 
     }
 
+
     @PostMapping("/findFaceUserByName")
     public  Result findFaceUserByName(String userName){
         return faceUserService.findFaceUserByName(userName);
@@ -172,4 +175,12 @@ public class FaceUserController {
         return faceUserImgsService.upload(ID,XM,USERID,file);
     }
 
+    @Autowired
+    FaceUserImgRepository faceUserImgRepository;
+
+    @RequestMapping(value = "/alarm", method = RequestMethod.GET)
+    public JSONObject listUser() {
+
+        return   faceUserImgsService.findAlam();
+    }
 }

shiwan/face/src/main/java/com/huimv/face/domain/XtHkbjgzxx.java

@@ -0,0 +1,363 @@
+package com.huimv.face.domain;
+
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class XtHkbjgzxx  {
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.ID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.JQID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private String jqid;
+
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.GZLX
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private String gzlx;
+
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.FSSJ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private Date fssj;
+
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.JSSJ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private Date jssj;
+
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.SBLX
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private String sblx;
+
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.SBXH
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private String sbxh;
+
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.UUID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private String uuid;
+
+    /**
+     * This field was generated by Apache iBATIS ibator.
+     * This field corresponds to the database column xt_hkbj_gzxx.TXBZ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    private Integer txbz;
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.ID
+     *
+     * @return the value of xt_hkbj_gzxx.ID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.ID
+     *
+     * @param id the value for xt_hkbj_gzxx.ID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.JQID
+     *
+     * @return the value of xt_hkbj_gzxx.JQID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public String getJqid() {
+        return jqid;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.JQID
+     *
+     * @param jqid the value for xt_hkbj_gzxx.JQID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setJqid(String jqid) {
+        this.jqid = jqid == null ? null : jqid.trim();
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.GZLX
+     *
+     * @return the value of xt_hkbj_gzxx.GZLX
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public String getGzlx() {
+        return gzlx;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.GZLX
+     *
+     * @param gzlx the value for xt_hkbj_gzxx.GZLX
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setGzlx(String gzlx) {
+        this.gzlx = gzlx == null ? null : gzlx.trim();
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.FSSJ
+     *
+     * @return the value of xt_hkbj_gzxx.FSSJ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public Date getFssj() {
+        return fssj;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.FSSJ
+     *
+     * @param fssj the value for xt_hkbj_gzxx.FSSJ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setFssj(Date fssj) {
+        this.fssj = fssj;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.JSSJ
+     *
+     * @return the value of xt_hkbj_gzxx.JSSJ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public Date getJssj() {
+        return jssj;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.JSSJ
+     *
+     * @param jssj the value for xt_hkbj_gzxx.JSSJ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setJssj(Date jssj) {
+        this.jssj = jssj;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.SBLX
+     *
+     * @return the value of xt_hkbj_gzxx.SBLX
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public String getSblx() {
+        return sblx;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.SBLX
+     *
+     * @param sblx the value for xt_hkbj_gzxx.SBLX
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setSblx(String sblx) {
+        this.sblx = sblx == null ? null : sblx.trim();
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.SBXH
+     *
+     * @return the value of xt_hkbj_gzxx.SBXH
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public String getSbxh() {
+        return sbxh;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.SBXH
+     *
+     * @param sbxh the value for xt_hkbj_gzxx.SBXH
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setSbxh(String sbxh) {
+        this.sbxh = sbxh == null ? null : sbxh.trim();
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.UUID
+     *
+     * @return the value of xt_hkbj_gzxx.UUID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.UUID
+     *
+     * @param uuid the value for xt_hkbj_gzxx.UUID
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid == null ? null : uuid.trim();
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method returns the value of the database column xt_hkbj_gzxx.TXBZ
+     *
+     * @return the value of xt_hkbj_gzxx.TXBZ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public Integer getTxbz() {
+        return txbz;
+    }
+
+    /**
+     * This method was generated by Apache iBATIS ibator.
+     * This method sets the value of the database column xt_hkbj_gzxx.TXBZ
+     *
+     * @param txbz the value for xt_hkbj_gzxx.TXBZ
+     *
+     * @ibatorgenerated Tue Aug 27 13:06:53 CST 2019
+     */
+    public void setTxbz(Integer txbz) {
+        this.txbz = txbz;
+    }
+
+    private int count;
+	    
+    private String gzxx;
+    
+    private String zsmc;
+    
+    private String mcmc;
+    
+    private String fssjStr;
+
+    private String zsqy;
+	
+	public String getZsmc() {
+		return zsmc;
+	}
+
+	
+	public void setZsmc(String zsmc) {
+		this.zsmc = zsmc;
+	}
+
+	
+	public String getMcmc() {
+		return mcmc;
+	}
+
+	
+	public void setMcmc(String mcmc) {
+		this.mcmc = mcmc;
+	}
+
+	public String getGzxx() {
+		return gzxx;
+	}
+
+	public void setGzxx(String gzxx) {
+		this.gzxx = gzxx;
+	}
+
+	public int getCount() {
+		return count;
+	}
+
+	public void setCount(int count) {
+		this.count = count;
+	}
+
+	
+	public String getFssjStr() {
+		return fssjStr;
+	}
+
+	
+	public void setFssjStr(String fssjStr) {
+		this.fssjStr = fssjStr;
+	}
+
+	
+	public String getZsqy() {
+		return zsqy;
+	}
+
+	
+	public void setZsqy(String zsqy) {
+		this.zsqy = zsqy;
+	}
+}

shiwan/face/src/main/java/com/huimv/face/repo/FaceRecoRepository.java

@@ -10,4 +10,6 @@ import java.util.List;
 public interface FaceRecoRepository extends JpaRepository<FaceReco, Integer>, JpaSpecificationExecutor<FaceReco> {
     @Query(nativeQuery = true,value = "SELECT * FROM face_reco WHERE SBID=\"110201190808KN4872\" OR SBID=\"110201190808KN2340\" OR SBID=\"110201190808KN1206\" OR SBID=\"110201190808KN4475\" OR SBID=\"110201190808KN1937\" OR SBID=\"110201190808KN4191\" OR SBID=\"110201190808KN4746\" OR SBID=\"110201190808KN0582\" OR SBID=\"110201190808KN1791\" OR SBID=\"110201190808KN2096\" OR SBID=\"110201190808KN1555\" OR SBID=\"110201190808KN2053\" ORDER BY id  DESC   LIMIT  10 ")
     List<FaceReco> findTop10ByOrderByIdDesc();
+
+
 }

shiwan/face/src/main/java/com/huimv/face/repo/FaceSbdaRepository.java

@@ -9,4 +9,7 @@ public interface FaceSbdaRepository extends JpaRepository<FaceSbda, Integer>, Jp
 
     @Query(nativeQuery = true,value = "SELECT * FROM  face_sbda  where SBID= ?1")
     FaceSbda findAllBySBID(String SBID);
+
+    @Query(nativeQuery = true,value = "SELECT * FROM  face_sbda  where SBID= ?1")
+    FaceSbda findAllBySBID1(String SBID);
 }

shiwan/face/src/main/java/com/huimv/face/repo/FaceUserImgRepository.java

@@ -1,9 +1,13 @@
 package com.huimv.face.repo;
 
 import com.huimv.face.domain.FaceUserImgs;
+import com.huimv.face.domain.XtHkbjgzxx;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.face.repo
@@ -14,4 +18,27 @@ import org.springframework.data.jpa.repository.Query;
 public interface FaceUserImgRepository extends JpaRepository<FaceUserImgs, Integer> {
     @Query(nativeQuery = true,value = "SELECT * FROM  face_user_img  where user_id= ?1")
     FaceUserImgs findAllByUserId(String userId);
+
+
+    @Query(nativeQuery = true,value = "  SELECT gzxx.*, gydm.dmmc gzxx, zsda.zsmc zsmc, mcda.mcmc mcmc, zsda.zsqy zsqy\n" +
+            "      FROM da_jqda jqda, da_zsda zsda, da_mcda mcda, xt_hkbj_gzxx gzxx \n" +
+            "      LEFT JOIN xt_gydm gydm \n" +
+            "      ON gydm.zfbz = 0 \n" +
+            "      AND gydm.lbid = 32\n" +
+            "       AND gydm.dmid = gzxx.gzlx\n" +
+            "    WHERE jqda.zfbz = 0\n" +
+            "     AND zsda.zfbz = 0 \n" +
+            "     AND mcda.zfbz = 0 \n" +
+            "     AND zsda.id = jqda.zsid \n" +
+            "     AND jqda.jqid = gzxx.jqid\n" +
+            "      AND mcda.id = zsda.mcid      AND mcda.id = 39        \n" +
+            "     AND gzxx.jssj IS NULL \n" +
+            "  \n" +
+            "     AND gzxx.gzlx IN (1, 2, 3, 4, 5) AND fssj > DATE_ADD(NOW(),INTERVAL -10 DAY) AND zsda.ssqy != '5'  GROUP BY jqid,gzlx ")
+
+            //之后改成牧场id
+            public   List<Object[]>   findAlarm();
+
+
+
 }

shiwan/face/src/main/java/com/huimv/face/service/FaceUserImgsService.java

@@ -1,11 +1,17 @@
 package com.huimv.face.service;
 
-import com.huimv.face.domain.FaceUserImgs;
-import com.huimv.face.result.Result;
-import org.springframework.web.multipart.MultipartFile;
+import com.alibaba.fastjson.JSONObject;
+import  com.huimv.face.domain.FaceUserImgs;
+import  com.huimv.face.result.Result;
+import  org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
 
 public interface FaceUserImgsService {
-    Result upload(Integer ID ,String XM , String USERID, MultipartFile file);
+    Result upload(Integer ID, String XM, String USERID, MultipartFile file);
 
     FaceUserImgs findAllByUserId(String userid);
-}
+
+    JSONObject  findAlam();
+}

shiwan/face/src/main/java/com/huimv/face/service/FaceUserService.java

@@ -19,4 +19,5 @@ public interface FaceUserService {
     FaceUser findAllByUserId(String userid);
 
     Result findFaceUserByName(String userName);
+
 }

shiwan/face/src/main/java/com/huimv/face/service/impl/FaceUserImgsServiceImpl.java

@@ -1,5 +1,7 @@
 package com.huimv.face.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.huimv.face.domain.FaceUserImgs;
 import com.huimv.face.repo.FaceUserImgRepository;
 import com.huimv.face.result.Result;
@@ -9,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * @Project : huimv.shiwan
@@ -21,15 +24,16 @@ import java.io.IOException;
 public class FaceUserImgsServiceImpl implements FaceUserImgsService {
     @Autowired
     private FaceUserImgRepository faceUserImgRepository;
+
     @Override
-    public Result upload(Integer ID ,String XM , String USERID, MultipartFile file) {
+    public Result upload(Integer ID, String XM, String USERID, MultipartFile file) {
 //        try {
-            FaceUserImgs faceUserImgs = faceUserImgRepository.findAllByUserId(USERID);
-            if (faceUserImgs == null){
-                faceUserImgs = new FaceUserImgs();
-            }
-            faceUserImgs.setUserId(USERID);
-            faceUserImgs.setUserName(XM);
+        FaceUserImgs faceUserImgs = faceUserImgRepository.findAllByUserId(USERID);
+        if (faceUserImgs == null) {
+            faceUserImgs = new FaceUserImgs();
+        }
+        faceUserImgs.setUserId(USERID);
+        faceUserImgs.setUserName(XM);
         try {
             faceUserImgs.setImg(file.getBytes());
         } catch (IOException e) {
@@ -37,7 +41,7 @@ public class FaceUserImgsServiceImpl implements FaceUserImgsService {
         }
 
         faceUserImgRepository.save(faceUserImgs);
-            return new Result(10001,"添加成功");
+        return new Result(10001, "添加成功");
 //        }catch (Exception e){
 //            return new Result(10001,"添加失败");
 //        }
@@ -48,4 +52,90 @@ public class FaceUserImgsServiceImpl implements FaceUserImgsService {
     public FaceUserImgs findAllByUserId(String userid) {
         return faceUserImgRepository.findAllByUserId(userid);
     }
+
+
+    @Override
+    public JSONObject findAlam() {
+
+        List<Object[]> Alarm = faceUserImgRepository.findAlarm();
+        JSONArray userAccountJa = new JSONArray();
+
+        for (int a = 0; a < Alarm.size(); a++) {
+            Object[] userAccountObj = (Object[]) Alarm.get(a);
+            /* 封装用户和账户关联对象 */
+            userAccountJa.add(packageUserAccountRelatedObj(userAccountObj));
+        }
+
+        JSONObject resultJo = new JSONObject();
+        resultJo.put("code", 10001);
+        resultJo.put("data", userAccountJa);
+        return resultJo;
+    }
+
+    /**
+     * 封装对象
+     */
+    private Object packageUserAccountRelatedObj(Object[] userAccountObj) {
+        JSONObject dataJo = new JSONObject();
+
+        dataJo.put("ID", userAccountObj[0].toString());
+        dataJo.put("JQID", userAccountObj[1].toString());
+        if (userAccountObj[2] == null) {
+            dataJo.put("GZLX", "");
+        } else {
+            dataJo.put("GZLX", userAccountObj[2].toString());
+        }
+        if (userAccountObj[3] == null) {
+            dataJo.put("FSSJ", "");
+        } else {
+            dataJo.put("FSSJ", userAccountObj[3].toString());
+        }
+        if (userAccountObj[4] == null) {
+            dataJo.put("JSSJ", "");
+        } else {
+            dataJo.put("JSSJ", userAccountObj[4].toString());
+        }
+        if (userAccountObj[5] == null) {
+            dataJo.put("SBLX", "");
+        } else {
+            dataJo.put("SBLX", userAccountObj[5].toString());
+        }
+        if (userAccountObj[6] == null) {
+            dataJo.put("SBXH", "");
+        } else {
+            dataJo.put("SBXH", userAccountObj[6].toString());
+        }
+        if (userAccountObj[7] == null) {
+            dataJo.put("TXBZ", "");
+        } else {
+            dataJo.put("TXBZ", userAccountObj[7].toString());
+        }
+        if (userAccountObj[8] == null) {
+            dataJo.put("UUID", "");
+        } else {
+            dataJo.put("UUID", userAccountObj[8].toString());
+        }
+        if (userAccountObj[9] == null) {
+            dataJo.put("gzxx", "");
+        } else {
+            dataJo.put("gzxx", userAccountObj[9].toString());
+        }
+        if (userAccountObj[10] == null) {
+            dataJo.put("ZSMC", "");
+        } else {
+            dataJo.put("ZSMC", userAccountObj[10].toString());
+        }
+        if (userAccountObj[11] == null) {
+            dataJo.put("mcmc", "");
+        } else {
+            dataJo.put("mcmc", userAccountObj[11].toString());
+        }
+        if (userAccountObj[12] == null) {
+            dataJo.put("zsqy", "");
+        } else {
+            dataJo.put("zsqy", userAccountObj[12].toString());
+        }
+        return dataJo;
+    }
+
 }

shiwan/face/src/main/resources/application-prod.yml

@@ -2,13 +2,13 @@ server:
   port: 8081
 spring:
   application:
-    name: huimv-core
+    name: face
 
   #------DataSource-----
   datasource:
-    url: jdbc:mysql://127.0.0.1:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    #url: jdbc:mysql://192.168.1.7:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
+    #url: jdbc:mysql://127.0.0.1:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.219.87:3306/ifm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: huimv
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:

shiwan/face/src/main/resources/application-test.yml

@@ -6,8 +6,8 @@ spring:
   datasource:
       #url: jdbc:mysql://127.0.0.1:3306/huimv-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     url: jdbc:mysql://122.112.219.87:3306/ifm?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    username: root
-    password: ?root@huimv_farm!
+    username: huimv
+    password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     hibernate:

shiwan/face/src/test/java/com/huimv/face/FaceApplicationTests.java

@@ -1,12 +1,21 @@
 package com.huimv.face;
 
-import org.junit.jupiter.api.Test;
+;
+
+import com.huimv.face.repo.FaceRecoRepository;
+import com.huimv.face.repo.FaceUserImgRepository;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 class FaceApplicationTests {
-//  2020-09-08 13:17:14
+    private static FaceUserImgRepository faceRecoRepository;
+    //  2020-09-08 13:17:14
+
     @Test
     void contextLoads() {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -24,4 +33,10 @@ class FaceApplicationTests {
     }
 
 
+    @Test
+    void sss(){
+
+    }
+
+
 }