fix: 可见性

This reverts commit 3f7938a8c6.

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +0,0 @@
-# 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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

mvnw

@@ -1,316 +0,0 @@
-#!/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 "$@"

mvnw.cmd

@@ -1,188 +0,0 @@
-@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%

pom.xml

@@ -20,18 +20,21 @@
         <java.version>1.8</java.version>
         <xymanager.version>1.0.0</xymanager.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-boot-dependencies.version>2.5.6</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>2.5.15</spring-boot-dependencies.version>
+        <mysql.version>8.0.33</mysql.version>
         <swagger.version>3.0.0</swagger.version>
         <knife4j-spring-boot.version>3.0.2</knife4j-spring-boot.version>
         <swagger-annotations.version>1.5.21</swagger-annotations.version>
         <swagger-models.version>1.5.21</swagger-models.version>
-        <fastjson.version>1.2.79</fastjson.version>
-        <druid.version>1.2.8</druid.version>
-        <mybatis-spring-boot.version>2.2.0</mybatis-spring-boot.version>
-        <pagehelper.boot.version>1.4.0</pagehelper.boot.version>
-        <commons.fileupload.version>1.4</commons.fileupload.version>
+        <fastjson.version>1.2.83</fastjson.version>
+        <druid.version>1.2.23</druid.version>
+        <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
+        <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
+        <commons.fileupload.version>1.5</commons.fileupload.version>
         <jwt.version>0.9.0</jwt.version>
         <mybatisplus.version>3.2.0</mybatisplus.version>
+        <easyexcel.version>3.3.4</easyexcel.version>
+        <jackson.version>2.17.2</jackson.version>
     </properties>
 
     <dependencyManagement>
@@ -75,11 +78,6 @@
                 <version>${swagger.version}</version>
             </dependency>
 
-            <!--            <dependency>-->
-            <!--                <groupId>io.jsonwebtoken</groupId>-->
-            <!--                <artifactId>jjwt</artifactId>-->
-            <!--                <version>${jwt.version}</version>-->
-            <!--            </dependency>-->
 
             <!-- swagger ui-->
             <dependency>
@@ -101,6 +99,42 @@
                 <version>${swagger-models.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jdk8</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-parameter-names</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-yaml</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+
             <!-- 阿里JSON解析器 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
@@ -115,7 +149,12 @@
                 <artifactId>commons-fileupload</artifactId>
                 <version>${commons.fileupload.version}</version>
             </dependency>
-
+            <!-- 阿里excel表格工具-->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>easyexcel</artifactId>
+                <version>${easyexcel.version}</version>
+            </dependency>
 
             <!--一个开源工具类 一个Java基础工具类，对文件、流、加密解密、转码、正则、线程、XML等JDK方法进行封装，组成各种Util工具类-->
             <dependency>
@@ -124,13 +163,6 @@
                 <version>5.7.20</version>
             </dependency>
 
-            <!--            &lt;!&ndash;shiro&ndash;&gt;-->
-            <!--            <dependency>-->
-            <!--                <groupId>org.apache.shiro</groupId>-->
-            <!--                <artifactId>shiro-spring-boot-starter</artifactId>-->
-            <!--                <version>1.11.0</version>-->
-            <!--            </dependency>-->
-
 
             <!--JNA:调用本地dll-->
             <dependency>
@@ -140,13 +172,21 @@
             </dependency>
 
 
-<!--            <dependency>-->
-<!--                <groupId>javax.servlet</groupId>-->
-<!--                <artifactId>javax.servlet-api</artifactId>-->
-<!--                <version>4.0.1</version>-->
-<!--                <scope>provided</scope>-->
-<!--            </dependency>-->
-
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt-api</artifactId>
+                <version>0.11.5</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt-impl</artifactId>
+                <version>0.11.5</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt-jackson</artifactId> <!-- or jjwt-gson if Gson is preferred -->
+                <version>0.11.5</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -189,7 +229,7 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.5.6</version>
+                <version>${spring-boot-dependencies.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -206,6 +246,7 @@
                 <artifactId>mybatis-generator-maven-plugin</artifactId>
                 <version>1.3.5</version>
             </plugin>
+
         </plugins>
     </build>
 </project>

proguard.cfg

@@ -0,0 +1,57 @@
+## -keep {Modifier} {class_specification} 防止类和成员被移除或者被重命名
+## -keepclassmembers {modifier} {class_specification} 防止成员被移除或者被重命名
+## -keepclasseswithmembers {class_specification} 防止拥有该成员的类和成员被移除或者被重命名
+## -keepnames {class_specification} 防止成员被重命名
+## -keepclasseswithmembernames {class_specification} 防止拥有该成员的类和成员被重命名
+## -keepclasseswithmembers
+## -basedirectory directoryname  在配置文件中出现的相对路径均是相对于该路径
+#
+#
+## 忽略所有警告，否则有警告的时候混淆会停止
+#-ignorewarnings
+#
+## JDK目标版本1.8
+#-target 1.8
+#
+## 不做收缩（删除注释、未被引用代码）
+#-dontshrink
+#
+## 不做优化（变更代码实现逻辑）
+#-dontoptimize
+#
+## 不路过非公用类文件及成员
+#-dontskipnonpubliclibraryclasses
+#-dontskipnonpubliclibraryclassmembers
+#
+## 优化时允许访问并修改有修饰符的类和类的成员
+#-allowaccessmodification
+#
+## 确定统一的混淆类的成员名称来增加混淆
+#-useuniqueclassmembernames
+#
+## 不混淆所有包名，本人测试混淆后WEB项目问题实在太多，毕竟Spring配置中有大量固定写法的包名
+#-keeppackagenames
+#
+## 不混淆局部变量名
+#-keepparameternames
+#
+## 不混淆所有特殊的类 LocalVariable*Table,
+#-keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,*Annotation*,Synthetic,EnclosingMethod
+#
+## 不混淆包下的所有类名
+#-keep class weg.base.** { <methods>; }
+#-keep class weg.service.** { <methods>; }
+#-keep class weg.dao.** { <methods>; }
+#-keep class weg.util.** { <methods>; }
+#
+## 不混淆quartz包下的所有类名，且类中的方法也不混淆
+#-keep class weg.quartz.** { <methods>; }
+#
+## 不混淆model包中的所有类以及类的属性及方法，实体包，混淆了会导致ORM框架及前端无法识别
+#-keep class weg.model.** {*;}
+#
+## 不混淆所有的set/get方法，毕竟项目中使用的部分第三方框架（例如Shiro）会用到大量的set/get映射
+#-keepclassmembers public class * {void set*(***);*** get*();}
+#
+## 保持类protected不被混淆
+#-keep public class * { public protected <fields>;public protected <methods>; }

sql/sql

@@ -0,0 +1,103 @@
+CREATE TABLE `dev_type` (
+  `id` int(11) NOT NULL COMMENT '内部设备类型：1: 微拍 2: 拉力 3：微气象',
+  `name` varchar(1024) NOT NULL,
+  `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT NULL COMMENT '修改时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='设备类型表';
+
+CREATE
+    ALGORITHM = UNDEFINED
+    DEFINER = `xymp`@`localhost`
+    SQL SECURITY DEFINER
+VIEW `v_dy_line_towe_terminals` AS
+    SELECT
+        `d`.`id` AS `id`,
+        `a`.`id` AS `dy_id`,
+        `a`.`name` AS `dy_name`,
+        `b`.`id` AS `line_id`,
+        `b`.`name` AS `line_name`,
+        `b`.`bs_manufacturer` AS `line_bs_manufacturer`,
+        `c`.`id` AS `tower_id`,
+        `c`.`name` AS `tower_name`,
+        `d`.`cmdid` AS `cmdid`,
+        `d`.`org_id` AS `org_id`,
+        `d`.`equip_name` AS `equip_name`,
+        `d`.`display_name` AS `display_name`,
+        `d`.`model` AS `model`,
+        `d`.`essential_info_version` AS `essential_info_version`,
+        `d`.`has_pan` AS `has_pan`,
+        `d`.`bs_manufacturer` AS `bs_manufacturer`,
+        `d`.`bs_production_date` AS `bs_production_date`,
+        `d`.`bs_identifier` AS `bs_identifier`,
+        `d`.`latitude` AS `latitude`,
+        `d`.`longitude` AS `longitude`,
+        `d`.`status` AS `status`,
+        `d`.`protocol` AS `protocol`,
+        `d`.`sim` AS `sim`,
+        `d`.`working_date` AS `working_date`,
+        `d`.`net_type` AS `net_type`,
+        `d`.`dev_type` AS `dev_type`,
+        `d`.`phase` AS `phase`,
+        `d`.`equipment_type` AS `equipment_type`
+    FROM
+        (((`dy_level` `a`
+        LEFT JOIN `lines` `b` ON ((`a`.`id` = `b`.`dy_level_id`)))
+        LEFT JOIN `towers` `c` ON ((`b`.`id` = `c`.`line_id`)))
+        JOIN `terminals` `d` ON ((`c`.`id` = `d`.`tower_id`)))
+
+ALTER TABLE `xymp`.`sys_users`
+ADD COLUMN `notes` VARCHAR(1024) NULL DEFAULT NULL AFTER `password`;
+
+CREATE TABLE `terminal_upload` (
+  `path` varchar(500) NOT NULL COMMENT '上传路径',
+  `name` varchar(100) DEFAULT NULL COMMENT '文件名称',
+  `upload_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '上传时间',
+  `version` varchar(50) DEFAULT NULL COMMENT '版本号',
+  `title` varchar(1024) DEFAULT NULL COMMENT '备注'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='上传信息表';
+
+CREATE
+    ALGORITHM = UNDEFINED
+    DEFINER = `root`@`localhost`
+    SQL SECURITY DEFINER
+VIEW `v_dy_line_tower_terminals` AS
+    SELECT
+        `d`.`id` AS `id`,
+        `a`.`id` AS `dy_id`,
+        `a`.`name` AS `dy_name`,
+        `b`.`id` AS `line_id`,
+        `b`.`name` AS `line_name`,
+        `b`.`bs_manufacturer` AS `line_bs_manufacturer`,
+        `c`.`id` AS `tower_id`,
+        `c`.`name` AS `tower_name`,
+        `c`.`address` AS `address`,
+        `c`.`order` AS `order`,
+        `d`.`cmdid` AS `cmdid`,
+        `d`.`org_id` AS `org_id`,
+        `d`.`equip_name` AS `equip_name`,
+        `d`.`display_name` AS `display_name`,
+        `d`.`model` AS `model`,
+        `d`.`essential_info_version` AS `essential_info_version`,
+        `d`.`has_pan` AS `has_pan`,
+        `d`.`bs_manufacturer` AS `bs_manufacturer`,
+        `d`.`bs_production_date` AS `bs_production_date`,
+        `d`.`bs_identifier` AS `bs_identifier`,
+        `d`.`latitude` AS `latitude`,
+        `d`.`longitude` AS `longitude`,
+        `d`.`status` AS `status`,
+        `d`.`protocol` AS `protocol`,
+        `d`.`sim` AS `sim`,
+        `d`.`working_date` AS `working_date`,
+        `d`.`net_type` AS `net_type`,
+        `d`.`dev_type` AS `dev_type`,
+        `d`.`phase` AS `phase`,
+        `d`.`equipment_type` AS `equipment_type`,
+        `e`.`last_heartbeat` AS `last_heartbeat`
+    FROM
+        ((((`dy_level` `a`
+        LEFT JOIN `lines` `b` ON ((`a`.`id` = `b`.`dy_level_id`)))
+        LEFT JOIN `towers` `c` ON ((`b`.`id` = `c`.`line_id`)))
+        JOIN `terminals` `d` ON ((`c`.`id` = `d`.`tower_id`)))
+        LEFT JOIN `terminal_status` `e` ON ((`e`.`term_id` = `d`.`id`)))
+

sql/xiugai

@@ -0,0 +1 @@
+getdyList

xymanager_admin/.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +0,0 @@
-# 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.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

xymanager_admin/pom.xml

@@ -37,7 +37,7 @@
                 </exclusion>
             </exclusions>
             <scope>test</scope>
-            <version>2.5.6</version>
+            <version>${spring-boot-dependencies.version}</version>
         </dependency>
 
         <dependency>
@@ -96,7 +96,7 @@
 <!--                </excludes>-->
             </resource>
         </resources>
-        <finalName>xymanager-admin</finalName>
+        <finalName>xymanager</finalName>
 
     </build>
 </project>

xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java

@@ -1,12 +0,0 @@
-//package com.shxy.xymanager_admin;
-//
-//import org.springframework.boot.builder.SpringApplicationBuilder;
-//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-//
-//public class SpringBootStartApplication extends SpringBootServletInitializer {
-//    @Override
-//    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-//        // 注意这里要指向原先用main方法执行的Application启动类
-//        return builder.sources(XymanagerAdminApplication.class);
-//    }
-//}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java

@@ -13,15 +13,19 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @MapperScan("com.shxy.**.dao")
 @EnableAspectJAutoProxy(exposeProxy = true)
 @Slf4j
 @EnableConfigurationProperties
-@ComponentScan(basePackages = {"com.shxy"})
+@ComponentScan(basePackages = {"com.shxy","org.springframework.data.redis"})
 @EnableCaching
-public class XymanagerAdminApplication extends SpringBootServletInitializer{
+@EnableAsync
+@EnableScheduling
+public class XymanagerAdminApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         try {
@@ -36,8 +40,9 @@ public class XymanagerAdminApplication extends SpringBootServletInitializer{
             log.error("error>>>>>>>>>>>>>>>>>>>>>>>>>>>", e);
         }
     }
+
     @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application){
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
         return application.sources(XymanagerAdminApplication.class);
     }
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ActivityController.java

@@ -0,0 +1,66 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.MntnActivities;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_service.service.ActivitiesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@Api(tags = {"活动相关接口"})
+@RequestMapping("activity")
+@Slf4j
+public class ActivityController extends BaseController {
+
+    @Resource
+    ActivitiesService service;
+
+    @GetMapping("listAll")
+    @ApiOperation("查询全部列表")
+    @Log(title = "查询活动全部列表", type = "查询")
+    public ResponseReult<List<MntnActivities>> listAll(@RequestParam(value = "simple", required = false) String simple) {
+        List<MntnActivities> result = service.listAll(null, simple);
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("add")
+    @ApiOperation("新增")
+    @Log(title = "新增活动", type = "新增")
+    public ResponseReult<String> add(@Validated @RequestBody MntnActivities item) throws Exception {
+        service.add(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("update")
+    @ApiOperation("修改")
+    @Log(title = "修改活动", type = "修改")
+    public ResponseReult<String> update(@Validated @RequestBody MntnActivities item) throws Exception {
+        if (item.getId() == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.update(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    @Log(title = "删除活动", type = "删除")
+    public ResponseReult<String> delete(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        if (id == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.delete(id);
+        return ResponseReult.success("OK");
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/CameraScheduleController.java

@@ -0,0 +1,42 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.CameraSchedule;
+import com.shxy.xymanager_service.service.CameraScheduleService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Api(tags = {"装置的拍照时间表接口"})
+@RequestMapping("schedule")
+@Slf4j
+public class CameraScheduleController extends BaseController {
+
+    @Resource
+    CameraScheduleService service;
+
+    @GetMapping("list")
+    @ApiOperation("查询")
+    @Log(title = "查询", type = "查询")
+    public ResponseReult<List<CameraSchedule>> list(@RequestParam(value = "termId", required = false) Integer termId) throws Exception {
+        List<CameraSchedule> result = service.list(termId);
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("getOne")
+    @ApiOperation("查询")
+    @Log(title = "查询", type = "查询")
+    public ResponseReult<CameraSchedule> getOne(@RequestParam(value = "termId", required = true) Integer termId,
+                                                @RequestParam(value = "channel", required = true) Integer channel) throws Exception {
+        CameraSchedule result = service.getOne(termId, channel);
+        return ResponseReult.success(result);
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/CmdController.java

@@ -0,0 +1,88 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.MntnCmdHistory;
+import com.shxy.xymanager_common.entity.MntnCmds;
+import com.shxy.xymanager_common.model.ActionModel;
+import com.shxy.xymanager_common.model.CmdModel;
+import com.shxy.xymanager_service.service.CmdService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@Api(tags = {"命令相关接口"})
+@RequestMapping("cmd")
+@Slf4j
+public class CmdController extends BaseController {
+
+    @Resource
+    CmdService cmdsService;
+
+    @GetMapping("listAction")
+    @ApiOperation("命令类型列表")
+    @Log(title = "查询命令类型", type = "查询")
+    public ResponseReult<List<ActionModel>> listAction() {
+        List<ActionModel> list = new ArrayList<>();
+        list.add(new ActionModel(1, "yw_cmd_android_reboot", "重启设备"));
+        list.add(new ActionModel(2, "yw_cmd_mcu_reboot", "MCU单片机重启"));
+        list.add(new ActionModel(3, "i1_cmd_set_i1_server_ip_port", "设置I1服务器"));
+//        list.add(new ActionModel(4, "i1_cmd_set_xy_yw_ip_port", "设置运维服务器"));
+        list.add(new ActionModel(5, "i1_cmd_set_i1_heart_beat_time", "设置心跳周期"));
+        list.add(new ActionModel(6, "yw_cmd_upload_i1_zip_log", "上传日志"));
+        list.add(new ActionModel(7, "upgrade", "升级"));
+        list.add(new ActionModel(8, "yw_cmd_start_frpc", "开启frpc"));
+        list.add(new ActionModel(9, "yw_cmd_stop_frpc", "停止frpc"));
+        list.add(new ActionModel(10, "i1_cmd_stop_aging_test", "停止老化测试"));
+        list.add(new ActionModel(11, "yw_upd_ota", "升级Ota"));
+        list.add(new ActionModel(12, "del_file", "删除文件"));
+        list.add(new ActionModel(13, "pull_files", "拉取文件"));
+        list.add(new ActionModel(14, "push_file", "推送文件"));
+        list.add(new ActionModel(15, "upd_cfg", "修改配置文件"));
+        list.add(new ActionModel(16, "list_files", "列出目录下的文件名"));
+        list.add(new ActionModel(17, "yw_app_upd_ota", "App增量更新"));
+        return ResponseReult.success(list);
+    }
+
+    @PostMapping("send")
+    @ApiOperation("下达命令")
+    @Log(title = "下达命令", type = "新增")
+    public ResponseReult<String> send(@RequestBody CmdModel model) throws Exception {
+        cmdsService.send(model);
+        return ResponseReult.success("OK");
+    }
+
+    @GetMapping("list")
+    @ApiOperation("查询")
+    @Log(title = "查询命令", type = "查询")
+    public ResponseReult<PageInfo<MntnCmds>> list(String cmdid, String action,
+                                                  Integer pageNum, Integer pageSize) {
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        PageInfo<MntnCmds> result = cmdsService.list(cmdid, action,
+                pageNum, pageSize);
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("listHistory")
+    @ApiOperation("查询历史")
+    @Log(title = "查询历史命令", type = "查询")
+    public ResponseReult<PageInfo<MntnCmdHistory>> listHistory(String cmdid, String action,
+                                                               Integer pageNum, Integer pageSize) {
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        PageInfo<MntnCmdHistory> result = cmdsService.listHistory(cmdid, action,
+                pageNum, pageSize);
+        return ResponseReult.success(result);
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DevTypeController.java

@@ -0,0 +1,36 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.DevType;
+import com.shxy.xymanager_common.entity.DevTypeExample;
+import com.shxy.xymanager_dao.dao.DevTypeDao;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Api(tags = {"设备类型相关接口"})
+@RequestMapping("devtype")
+@Slf4j
+public class DevTypeController extends BaseController {
+
+    @Resource
+    DevTypeDao devTypeDao;
+
+    @GetMapping("list")
+    @ApiOperation("查询列表")
+    public ResponseReult<List<DevType>> list() {
+        DevTypeExample example = new DevTypeExample();
+        example.createCriteria();
+        List<DevType> list = devTypeDao.selectByExample(example);
+        return ResponseReult.success(list);
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java

@@ -1,21 +1,33 @@
 package com.shxy.xymanager_admin.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.shxy.xymanager_common.annotation.Log;
 import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.bean.PermissionDetail;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.DyLevel;
+import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_Terminals;
+import com.shxy.xymanager_common.entity.View_Dy_Line_Tower_TerminalsExample;
+import com.shxy.xymanager_common.enums.CommonStatus;
 import com.shxy.xymanager_common.model.DyLineTreeListModel;
-import com.shxy.xymanager_common.model.DyListModel;
-import com.shxy.xymanager_common.vo.PageVo;
-import com.shxy.xymanager_common.vo.TerminalIdVo;
-import com.shxy.xymanager_common.vo.TestVo;
+import com.shxy.xymanager_common.model.TerminalPhotosModel;
+import com.shxy.xymanager_common.page.PageUtils;
+import com.shxy.xymanager_common.page.TableDataInfo;
+import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
+import com.shxy.xymanager_common.vo.*;
+import com.shxy.xymanager_dao.dao.View_Dy_Line_Tower_TerminalsDao;
 import com.shxy.xymanager_service.service.DyLevelService;
+import com.shxy.xymanager_service.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.validation.annotation.Validated;
@@ -24,23 +36,39 @@ import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
-
 @Api(value = "电压等级接口", tags = "电压等级接口描述")
 @RestController
 @Slf4j
+@RequestMapping("dy")
 public class DyLevelController extends BaseController {
 
     @Autowired
     DyLevelService dyLevelService;
 
-    @ApiOperation(value = "获取电压等级树状列表接口", notes = "获取电压等级树状列表接口", httpMethod = "POST")
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    View_Dy_Line_Tower_TerminalsDao view_dy_line_tower_terminalsDao;
+
+    @ApiOperation(value = "增加电压", notes = "增加电压", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/add")
+    @Log(title = "增加电压", type = "查询")
+    public ResponseReult<DyLevel> addDy(@RequestBody DyLevel vo) {
+        dyLevelService.add(vo);
+        return ResponseReult.success(vo);
+    }
+
+    @ApiOperation(value = "删除电压", notes = "删除电压", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/getdyTreeList")
-    @Log(title = "获取电压等级树状列表接口", type = "查询")
-    public ResponseReult<DyLineTreeListModel> getdyTreeList() {
-        ServiceBody<DyLineTreeListModel> serviceBody = dyLevelService.getdyTreeList();
+    @RequestMapping("/delete")
+    @Log(title = "删除电压", type = "查询")
+    public ResponseReult<String> deleteDy(@RequestBody @Validated LineIdVo vo) {
+        ServiceBody<String> serviceBody = dyLevelService.delete(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -48,12 +76,12 @@ public class DyLevelController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "获取电压等级列表", notes = "获取电压等级列表", httpMethod = "POST")
+    @ApiOperation(value = "修改电压", notes = "修改电压", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/getdyList")
-    @Log(title = "获取电压等级列表", type = "查询")
-    public ResponseReult<DyListModel> getdyList() {
-        ServiceBody<DyListModel> serviceBody = dyLevelService.getdyList();
+    @RequestMapping("/update")
+    @Log(title = "修改电压", type = "查询")
+    public ResponseReult<String> update(@RequestBody DyLevel vo) {
+        ServiceBody<String> serviceBody = dyLevelService.update(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -61,12 +89,12 @@ public class DyLevelController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "测试测试", notes = "测试测试", httpMethod = "POST")
+    @ApiOperation(value = "查询电压", notes = "查询电压", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/gettest")
-    @Log(title = "测试测试", type = "查询")
-    public ResponseReult<String> gettest(@RequestBody List<TestVo> vo) {
-        ServiceBody<String> serviceBody = dyLevelService.gettest(vo);
+    @RequestMapping("/listAll")
+    @Log(title = "查询电压", type = "查询")
+    public ResponseReult<TableDataInfo<DyLevel>> listAll(@RequestBody @Validated SelectVo vo) {
+        ServiceBody<TableDataInfo<DyLevel>> serviceBody = dyLevelService.listAll(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyTreeController.java

@@ -0,0 +1,93 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.bean.ServiceBody;
+import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.DyLevel;
+import com.shxy.xymanager_common.model.DyLineTreeListModel;
+import com.shxy.xymanager_common.model.TerminalPhotosModel;
+import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
+import com.shxy.xymanager_common.vo.DyListVo;
+import com.shxy.xymanager_common.vo.DyTreeListVo;
+import com.shxy.xymanager_common.vo.LastTowerVo;
+import com.shxy.xymanager_service.service.DyLevelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Api(value = "电压等级接口", tags = "电压等级接口描述")
+@RestController
+@Slf4j
+public class DyTreeController extends BaseController {
+
+    @Autowired
+    DyLevelService dyLevelService;
+
+    @ApiOperation(value = "获取电压等级树状列表接口", notes = "获取电压等级树状列表接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getdyTreeList")
+    @Log(title = "获取电压等级树状列表接口", type = "查询")
+    public ResponseReult<DyLineTreeListModel> getdyTreeList(@RequestBody @Validated DyTreeListVo vo) {
+        ServiceBody<DyLineTreeListModel> serviceBody = dyLevelService.getdyTreeList(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "郑州测试获取电压等级树状列表接口", notes = "郑州测试获取电压等级树状列表接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getzzdyTreeList")
+    @Log(title = "郑州测试获取电压等级树状列表接口", type = "查询")
+    public ResponseReult<DyLineTreeListModel> getzzdyTreeList(@RequestBody @Validated DyListVo vo) {
+        ServiceBody<DyLineTreeListModel> serviceBody = dyLevelService.getzzdyTreeList(vo.getType(), vo.getLineid());
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "获取电压等级列表", notes = "获取电压等级列表", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getdyList")
+    @Log(title = "获取电压等级列表", type = "查询")
+    public ResponseReult<List<DyLevel>> getdyList() {
+        ServiceBody<List<DyLevel>> serviceBody = dyLevelService.getdyList();
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "根据电压或者线路获取所有杆塔和最新照片", notes = "根据电压或者线路获取所有杆塔和最新照片", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTowerAndPhotoList")
+    @Log(title = "根据电压或者线路获取所有杆塔和最新照片", type = "查询")
+    public ResponseReult<TerminalPhotosModel> getLastTowerList(@RequestHeader HttpHeaders headers, @RequestBody LastTowerVo vo) {
+        String requestIp = HeaderUtil.getRequestIp(headers);
+        ServiceBody<TerminalPhotosModel> serviceBody = dyLevelService.getLastTowerList(requestIp, vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/GloableParamsController.java

@@ -5,6 +5,7 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.model.GlobalParamsModel;
 import com.shxy.xymanager_service.service.GloablParamsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -29,8 +30,8 @@ public class GloableParamsController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getMarkEnableStatus")
     @Log(title = "查询图片绘制开关状态", type = "查询")
-    public ResponseReult<Integer> getMarkEnableStatus() {
-        ServiceBody<Integer> serviceBody = gloableParamsService.getMarkEnableStatus();
+    public ResponseReult<GlobalParamsModel> getMarkEnableStatus() {
+        ServiceBody<GlobalParamsModel> serviceBody = gloableParamsService.getMarkEnableStatus();
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -42,7 +43,7 @@ public class GloableParamsController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/updateMarkEnableStatus")
     @Log(title = "修改图片绘制开关状态", type = "修改")
-    public ResponseReult<String> updateMarkEnableStatus(@RequestParam("status")  Integer status) {
+    public ResponseReult<String> updateMarkEnableStatus(@RequestParam("status") Integer status) {
         ServiceBody<String> serviceBody = gloableParamsService.updateMarkEnableStatus(status);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
@@ -51,5 +52,17 @@ public class GloableParamsController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "修改告警展示的通道接口", notes = "修改告警展示的通道接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/updateAlarmChannel")
+    @Log(title = "修改告警展示的通道接口", type = "修改")
+    public ResponseReult<String> updateAlarmChannel(@RequestParam("channel") Integer status) {
+        ServiceBody<String> serviceBody = gloableParamsService.updateAlarmChannel(status);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
 
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/KaptchaController.java

@@ -0,0 +1,66 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.google.code.kaptcha.Constants;
+import com.google.code.kaptcha.Producer;
+import com.shxy.xymanager_common.kaptcha.KaptchaCache;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+
+@RestController
+@Slf4j
+@Api(value = "生成验证码", description = "生成验证码")
+public class KaptchaController {
+    @Autowired
+    private Producer captchaProducer;
+
+    @ApiOperation("生成验证码")
+    @GetMapping("/kaptcha")
+    public void getKaptchaImage(HttpServletRequest request, HttpServletResponse response){
+        HttpSession session = request.getSession();
+        response.setDateHeader("Expires", 0);
+        // Set standard HTTP/1.1 no-cache headers.
+        response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
+        // Set IE extended HTTP/1.1 no-cache headers (use addHeader).
+        response.addHeader("Cache-Control", "post-check=0, pre-check=0");
+        // Set standard HTTP/1.0 no-cache header.
+        response.setHeader("Pragma", "no-cache");
+        // return a jpeg
+        response.setContentType("image/jpeg");
+        // create the text for the image
+        String capText = captchaProducer.createText();
+        log.info("登录验证码:{}",capText);
+        // store the text in the session
+        session.setAttribute(Constants.KAPTCHA_SESSION_KEY, capText);
+        KaptchaCache.getInstance().put(capText.toLowerCase(), capText);
+        //        KaptchaCache.getInstance().put(capText.toLowerCase());
+        // create the image with the text
+        BufferedImage bi = captchaProducer.createImage(capText);
+        ServletOutputStream out;
+        try {
+            out = response.getOutputStream();
+            // write the data out
+            ImageIO.write(bi, "jpg", out);
+
+            out.flush();
+            response.flushBuffer();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LeadPullsController.java

@@ -0,0 +1,112 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.LeadPulls;
+import com.shxy.xymanager_common.model.StatLeadPull;
+import com.shxy.xymanager_common.util.EasyExcelUtil;
+import com.shxy.xymanager_service.service.LeadPullsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@Api(tags = {"拉力相关接口"})
+@RequestMapping("leadpulls")
+@Slf4j
+public class LeadPullsController extends BaseController {
+
+    @Resource
+    LeadPullsService service;
+
+    @GetMapping("list")
+    @ApiOperation("查询列表")
+    @Log(title = "查询拉力列表", type = "查询")
+    public ResponseReult<PageInfo<LeadPulls>> list(Integer lineId, Integer towerId, Integer termId,
+                                                   Long start, Long end,
+                                                   Integer pageNum, Integer pageSize) {
+        List<Integer> idList = null;
+        if (termId != null) {
+            idList = new ArrayList<>();
+            idList.add(termId);
+        }
+        PageInfo<LeadPulls> result = service.list(lineId, towerId, idList,
+                start, end, pageNum, pageSize);
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("listStat")
+    @ApiOperation("查询统计")
+    @Log(title = "查询拉力统计", type = "查询")
+    public ResponseReult<List<StatLeadPull>> listStat(Integer lineId, Integer towerId, Integer termId,
+                                                      Long start, Long end,
+                                                      Integer pageNum, Integer pageSize) {
+        List<Integer> idList = null;
+        if (termId != null) {
+            idList = new ArrayList<>();
+            idList.add(termId);
+        }
+        pageNum = 1;
+        pageSize = 100000;
+        PageInfo<LeadPulls> result = service.list(lineId, towerId, idList,
+                start, end, pageNum, pageSize);
+        List<StatLeadPull> list = this.buildStat(result.getList());
+        return ResponseReult.success(list);
+    }
+
+    private List<StatLeadPull> buildStat(List<LeadPulls> list) {
+        List<StatLeadPull> result = new ArrayList<>();
+        if (list != null) {
+            for (LeadPulls item : list) {
+                StatLeadPull term = this.findStatTerm(result, item);
+                term.addLeadPull(item);
+            }
+        }
+        return result;
+    }
+
+    private StatLeadPull findStatTerm(List<StatLeadPull> list, LeadPulls leadPulls) {
+        StatLeadPull the = null;
+        for (StatLeadPull item : list) {
+            if (item.getTermId() == leadPulls.getTermId()) {
+                the = item;
+                break;
+            }
+        }
+        if (the == null) {
+            the = new StatLeadPull();
+            the.setTermId(leadPulls.getTermId());
+            the.setCmdid(leadPulls.getCmdid());
+            list.add(the);
+        }
+        return the;
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @Log(title = "导出拉力", type = "导出")
+    public void export(Integer lineId, Integer towerId, Integer termId,
+                       Long start, Long end,
+                       Integer pageNum, Integer pageSize,
+                       HttpServletResponse response) throws Exception {
+        List<Integer> idList = null;
+        if (termId != null) {
+            idList = new ArrayList<>();
+            idList.add(termId);
+        }
+        PageInfo<LeadPulls> result = service.list(lineId, towerId, idList,
+                start, end, pageNum, pageSize);
+        EasyExcelUtil.createExcel(response, "覆冰数据", result.getList(), LeadPulls.class);
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java

@@ -5,9 +5,9 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.Lines;
 import com.shxy.xymanager_common.model.LineAndGtAndChannelListModel;
-import com.shxy.xymanager_common.model.LineListModel;
-import com.shxy.xymanager_common.model.DyLineTreeListModel;
+import com.shxy.xymanager_common.page.TableDataInfo;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_service.service.LineService;
 import io.swagger.annotations.Api;
@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 @Api(value = "线路接口", tags = "线路相关")
 @RestController
@@ -34,8 +36,8 @@ public class LineController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getLineList")
     @Log(title = "获取线路列表", type = "查询")
-    public ResponseReult<LineListModel> getLineList(@RequestBody @Validated PageVo vo) {
-        ServiceBody<LineListModel> serviceBody = lineService.getLineList(vo);
+    public ResponseReult<TableDataInfo<Lines>> getLineList(@RequestBody @Validated SelectVo vo) {
+        ServiceBody<TableDataInfo<Lines>> serviceBody = lineService.getLineList(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -48,13 +50,9 @@ public class LineController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/addLine")
     @Log(title = "添加线路", type = "新增")
-    public ResponseReult<String> addLine(@RequestBody @Validated LineVo vo) {
-        ServiceBody<String> serviceBody = lineService.addLine(vo);
-        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
-            return ResponseReult.success(serviceBody.getData());
-        } else {
-            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
-        }
+    public ResponseReult<List<Lines>> addLine(@RequestBody @Validated LineVo vo) {
+        List<Lines> list = lineService.addLine(vo);
+        return ResponseReult.success(list);
     }
 
     @ApiOperation(value = "删除线路", notes = "删除线路接口", httpMethod = "POST")

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnController.java

@@ -0,0 +1,81 @@
+package com.shxy.xymanager_admin.controller;
+
+
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_common.util.DingTalkPushUtil;
+import com.shxy.xymanager_common.util.HttpRequestUtil;
+import com.shxy.xymanager_common.util.JSONUtil;
+import com.shxy.xymanager_common.util.StringUtils;
+import com.shxy.xymanager_framework.timeTask.ClearCacheTask;
+import com.shxy.xymanager_service.service.MntnService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@Api(tags = {"设备接入接口"})
+@RequestMapping("mntn")
+@Slf4j
+public class MntnController extends BaseController {
+
+    @Resource
+    MntnService service;
+
+    @PostMapping("")
+    @ApiOperation("上传心跳并返回命令")
+    public HashMap<String, Object> sync(@RequestBody String data,
+                                        HttpServletRequest req, HttpServletResponse resp) {
+        String ip = HttpRequestUtil.getRemoteIp(req);
+        String url = req.getRequestURI();
+        try {
+            String multi = req.getHeader("Accept-Cmds");
+            Map<String, Object> map = JSONUtil.json2Object(data, Map.class);
+            String cmdid = (String) map.get("id");
+            if (StringUtils.isBlank(cmdid)) {
+                cmdid = (String) map.get("oid");
+                if (StringUtils.isBlank(cmdid)) {
+                    throw new ApiException("id不能为空");
+                }
+            }
+            HashMap<String, Object> result = service.sync(cmdid, ip, multi, data);
+            resp.setHeader("ResSyncTime", String.valueOf(System.currentTimeMillis()));
+            return result;
+        } catch (Exception ex) {
+            if (!ClearCacheTask.heartbeatMap.containsKey(ip)) {
+                ClearCacheTask.heartbeatMap.put(ip, 1L);
+                String str = ex.getMessage() + ", ip=" + ip + ", url=" + url + ", " + data;
+                if (ex instanceof ApiException) {
+                    log.error("上传心跳异常, " + str);
+                } else {
+                    log.error("上传心跳异常.", ex);
+                }
+//                DingTalkPushUtil.pushText("运维心跳", str);
+            }
+            HashMap<String, Object> result = new HashMap<>();
+            result.put("code", "400");
+            result.put("msg", ex.getMessage());
+            return result;
+        }
+    }
+
+    @GetMapping("status")
+    @ApiOperation("上传命令结果")
+    public ResponseReult status(@RequestParam("cid") Long cid,
+                                @RequestParam("res") Integer res,
+                                @RequestParam("content") String content) {
+        service.result(cid, res, content);
+        ResponseReult resp = new ResponseReult();
+        resp.setCode(0);
+        return resp;
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MntnUploadController.java

@@ -0,0 +1,75 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.MntnUploads;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_service.service.MntnUploadService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@Api(tags = {"运维上传日志相关接口"})
+@RequestMapping("upload")
+@Slf4j
+public class MntnUploadController extends BaseController {
+
+    @Resource
+    MntnUploadService service;
+
+    @GetMapping("listAll")
+    @ApiOperation("查询日志全部列表")
+    @Log(title = "查询日志全部列表", type = "查询")
+    public ResponseReult<List<MntnUploads>> listAll(Integer type, String cmdid) {
+        List<MntnUploads> result = service.listAll(type, cmdid);
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    @Log(title = "删除日志", type = "删除")
+    public ResponseReult<String> delete(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        if (id == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.delete(id);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("uploadLog")
+    @ApiOperation("上传日志")
+    @Log(title = "上传日志", type = "新增")
+    public ResponseReult uploadLog(@RequestParam("file") MultipartFile file,
+                                   @RequestParam(value = "termId", required = false) Integer termId) throws Exception {
+        if (termId == null) {
+            termId = 0;
+        }
+        service.uploadLog(termId, file);
+        ResponseReult result = new ResponseReult();
+        result.setCode(0);
+        return result;
+    }
+
+    @PostMapping("uploadFile")
+    @ApiOperation("上传文件")
+    @Log(title = "上传文件", type = "新增")
+    public ResponseReult uploadFile(@RequestParam("file") MultipartFile file,
+                                    @RequestParam(value = "termId", required = false) Integer termId) throws Exception {
+        if (termId == null) {
+            termId = 0;
+        }
+        service.uploadFile(termId, file);
+        ResponseReult result = new ResponseReult();
+        result.setCode(0);
+        return result;
+    }
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/MqttController.java

@@ -0,0 +1,34 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.model.mqtt.MessageSend;
+import com.shxy.xymanager_service.mqtt.MqttPublisherService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags = {"mqtt相关接口"})
+@RequestMapping("mqtt")
+@Slf4j
+public class MqttController extends BaseController {
+
+    @Resource
+    MqttPublisherService mqttPublisherService;
+
+    @PostMapping("send")
+    @ApiOperation("下达命令")
+    @Log(title = "下达命令", type = "下达")
+    public ResponseReult<String> send(@RequestBody MessageSend msg) throws Exception {
+        mqttPublisherService.publish(msg, "N938XY12345678901");
+        return ResponseReult.success("OK");
+    }
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/NewLineController.java

@@ -0,0 +1,46 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.Lines;
+import com.shxy.xymanager_common.vo.*;
+import com.shxy.xymanager_service.service.LineService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@Api(tags = {"线路新接口"})
+@RequestMapping("line")
+@Slf4j
+public class NewLineController extends BaseController {
+
+    @Autowired
+    LineService lineService;
+
+    @ApiOperation(value = "查询线路全量列表")
+    @PostMapping("listFull")
+    @Log(title = "获取线路列表", type = "查询")
+    public ResponseReult<PageInfo<Lines>> listFull(@RequestBody @Validated SelectVo vo) {
+        PageInfo<Lines> list = lineService.listFull(vo);
+        return ResponseReult.success(list);
+    }
+
+    @ApiOperation(value = "查询线路超量列表")
+    @PostMapping("listOver")
+    @Log(title = "获取线路列表", type = "查询")
+    public ResponseReult<PageInfo<Lines>> listOver(@RequestBody @Validated SelectVo vo) {
+        PageInfo<Lines> list = lineService.listOver(vo);
+        return ResponseReult.success(list);
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/OpenController.java

@@ -1,80 +1,80 @@
-package com.shxy.xymanager_admin.controller;
-
-import cn.hutool.json.JSONObject;
-import com.shxy.xymanager_common.annotation.Log;
-import com.shxy.xymanager_common.base.BaseController;
-import com.shxy.xymanager_common.base.ResponseReult;
-import com.shxy.xymanager_common.bean.ServiceBody;
-import com.shxy.xymanager_common.bean.ServiceStatus;
-import com.shxy.xymanager_common.model.*;
-import com.shxy.xymanager_common.util.HeaderUtil;
-import com.shxy.xymanager_common.vo.*;
-import com.shxy.xymanager_service.service.OpenService;
-import com.shxy.xymanager_service.service.TerminalPhotoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@Api(value = "精益化平台接口", tags = "精益化平台相关")
-@RestController
-@Slf4j
-public class OpenController extends BaseController {
-
-    @Autowired
-    TerminalPhotoService terminalPhotoService;
-
-    @Autowired
-    OpenService openService;
-
-
-    @ApiOperation(value = "对外图片查询", notes = "对外图片查询", httpMethod = "POST")
-    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/getPhotoListForOpen")
-    @Log(title = "对外图片查询", type = "查询")
-    public ResponseReult<TerminalPhotoListForOpenModel> getPhotoListForOpen(@RequestHeader HttpHeaders headers, @RequestBody @Validated OpenTerminalAndTimeVo vo) {
-        String requestIp = HeaderUtil.getRequestIp(headers);
-        ServiceBody<TerminalPhotoListForOpenModel> serviceBody = terminalPhotoService.getPhotoListForOpen(requestIp,vo);
-        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
-            return ResponseReult.success(serviceBody.getData());
-        } else {
-            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
-        }
-    }
-
-    @ApiOperation(value = "第三方登录认证接口", notes = "第三方登录认证接口", httpMethod = "POST")
-    @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")})
-    @RequestMapping("/cmaUserLogin")
-    @Log(title = "第三方登录认证接口", type = "查询")
-    public JSONObject cmaUserLogin(@RequestBody @Validated UserLoginVo vo) {
-        JSONObject serviceBody = openService.cmaUserLogin(vo);
-        return serviceBody;
-    }
-
-    @ApiOperation(value = "远程拍照(短视频)控制", notes = "远程拍照(短视频)控制接口", httpMethod = "POST")
-    @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")})
-    @RequestMapping("/ctrlCmaDeviceCapture")
-    @Log(title = "远程拍照(短视频)控制", type = "查询")
-    public JSONObject ctrlCmaDeviceCapture(@RequestBody @Validated OpenDeviceCaptureVo vo) {
-        JSONObject serviceBody = openService.ctrlCmaDeviceCapture(vo);
-        return serviceBody;
-    }
-
-    @ApiOperation(value = "查询装置状态", notes = "查询装置状态接口", httpMethod = "POST")
-    @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")})
-    @RequestMapping("/cmaDeviceStatus")
-    @Log(title = "查询装置状态接口", type = "查询")
-    public JSONObject cmaDeviceStatus(@RequestBody @Validated OpenCmdidVo vo) {
-        JSONObject serviceBody = openService.cmaDeviceStatus(vo);
-        return serviceBody;
-    }
-}
+//package com.shxy.xymanager_admin.controller;
+//
+//import cn.hutool.json.JSONObject;
+//import com.shxy.xymanager_common.annotation.Log;
+//import com.shxy.xymanager_common.base.BaseController;
+//import com.shxy.xymanager_common.base.ResponseReult;
+//import com.shxy.xymanager_common.bean.ServiceBody;
+//import com.shxy.xymanager_common.bean.ServiceStatus;
+//import com.shxy.xymanager_common.model.*;
+//import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
+//import com.shxy.xymanager_common.vo.*;
+//import com.shxy.xymanager_service.service.OpenService;
+//import com.shxy.xymanager_service.service.TerminalPhotoService;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiOperation;
+//import io.swagger.annotations.ApiResponse;
+//import io.swagger.annotations.ApiResponses;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.http.HttpHeaders;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestHeader;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//
+//@Api(value = "精益化平台接口", tags = "精益化平台相关")
+//@RestController
+//@Slf4j
+//public class OpenController extends BaseController {
+//
+//    @Autowired
+//    TerminalPhotoService terminalPhotoService;
+//
+//    @Autowired
+//    OpenService openService;
+//
+//
+//    @ApiOperation(value = "对外图片查询", notes = "对外图片查询", httpMethod = "POST")
+//    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+//    @RequestMapping("/getPhotoListForOpen")
+//    @Log(title = "对外图片查询", type = "查询")
+//    public ResponseReult<TerminalPhotoListForOpenModel> getPhotoListForOpen(@RequestHeader HttpHeaders headers, @RequestBody @Validated OpenTerminalAndTimeVo vo) {
+//        String requestIp = HeaderUtil.getRequestIp(headers);
+//        ServiceBody<TerminalPhotoListForOpenModel> serviceBody = terminalPhotoService.getPhotoListForOpen(requestIp,vo);
+//        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+//            return ResponseReult.success(serviceBody.getData());
+//        } else {
+//            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+//        }
+//    }
+//
+//    @ApiOperation(value = "第三方登录认证接口", notes = "第三方登录认证接口", httpMethod = "POST")
+//    @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")})
+//    @RequestMapping("/cmaUserLogin")
+//    @Log(title = "第三方登录认证接口", type = "查询")
+//    public JSONObject cmaUserLogin(@RequestBody @Validated UserLoginVo vo) {
+//        JSONObject serviceBody = openService.cmaUserLogin(vo);
+//        return serviceBody;
+//    }
+//
+//    @ApiOperation(value = "远程拍照(短视频)控制", notes = "远程拍照(短视频)控制接口", httpMethod = "POST")
+//    @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")})
+//    @RequestMapping("/ctrlCmaDeviceCapture")
+//    @Log(title = "远程拍照(短视频)控制", type = "查询")
+//    public JSONObject ctrlCmaDeviceCapture(@RequestBody @Validated OpenDeviceCaptureVo vo) {
+//        JSONObject serviceBody = openService.ctrlCmaDeviceCapture(vo);
+//        return serviceBody;
+//    }
+//
+//    @ApiOperation(value = "查询装置状态", notes = "查询装置状态接口", httpMethod = "POST")
+//    @ApiResponses({@ApiResponse(code = 0, message = "请求成功"), @ApiResponse(code = 1, message = "用户名错误"), @ApiResponse(code = 2, message = "密码错误")})
+//    @RequestMapping("/cmaDeviceStatus")
+//    @Log(title = "查询装置状态接口", type = "查询")
+//    public JSONObject cmaDeviceStatus(@RequestBody @Validated OpenCmdidVo vo) {
+//        JSONObject serviceBody = openService.cmaDeviceStatus(vo);
+//        return serviceBody;
+//    }
+//}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ResourceController.java

@@ -0,0 +1,66 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.TbResource;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_service.service.ResourceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@Api(tags = {"资源相关接口"})
+@RequestMapping("resource")
+@Slf4j
+public class ResourceController extends BaseController {
+
+    @Resource
+    ResourceService service;
+
+    @GetMapping("listAll")
+    @ApiOperation("查询全部列表")
+    @Log(title = "查询资源全部列表", type = "查询")
+    public ResponseReult<List<TbResource>> listAll() {
+        List<TbResource> result = service.listAll();
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("add")
+    @ApiOperation("新增")
+    @Log(title = "新增资源", type = "新增")
+    public ResponseReult<String> add(@Validated @RequestBody TbResource item) throws Exception {
+        service.add(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("update")
+    @ApiOperation("修改")
+    @Log(title = "修改资源", type = "修改")
+    public ResponseReult<String> update(@Validated @RequestBody TbResource item) throws Exception {
+        if (item.getId() == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.update(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    @Log(title = "删除资源", type = "删除")
+    public ResponseReult<String> delete(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        if (id == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.delete(id);
+        return ResponseReult.success("OK");
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/RoleController.java

@@ -0,0 +1,87 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.TbRole;
+import com.shxy.xymanager_common.entity.TbRoleResource;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_common.model.RolePermissionModel;
+import com.shxy.xymanager_service.service.RolePermissionService;
+import com.shxy.xymanager_service.service.RoleService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@Api(tags = {"角色权限相关接口"})
+@RequestMapping("role")
+@Slf4j
+public class RoleController extends BaseController {
+
+    @Resource
+    RoleService service;
+    @Resource
+    RolePermissionService permissionService;
+
+    @GetMapping("listAll")
+    @ApiOperation("查询角色全部列表")
+    @Log(title = "查询角色全部列表", type = "查询")
+    public ResponseReult<List<TbRole>> listAll() {
+        List<TbRole> result = service.listAll();
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("add")
+    @ApiOperation("新增")
+    @Log(title = "新增角色", type = "新增")
+    public ResponseReult<String> add(@Validated @RequestBody TbRole item) throws Exception {
+        service.add(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("update")
+    @ApiOperation("修改")
+    @Log(title = "修改角色", type = "修改")
+    public ResponseReult<String> update(@Validated @RequestBody TbRole item) throws Exception {
+        if (item.getId() == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.update(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    @Log(title = "删除角色", type = "删除")
+    public ResponseReult<String> delete(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        if (id == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.delete(id);
+        return ResponseReult.success("OK");
+    }
+
+    @GetMapping("getPermission")
+    @ApiOperation("查询权限")
+    public ResponseReult<List<TbRoleResource>> getPermission(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        List<TbRoleResource> result = permissionService.getPermission(id);
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("changePermission")
+    @ApiOperation("修改角色权限")
+    @Log(title = "修改角色权限", type = "修改")
+    public ResponseReult<String> changePermission(@Validated @RequestBody RolePermissionModel item) throws Exception {
+        permissionService.changePermission(item.getRoleId(), item.getList());
+        return ResponseReult.success("OK");
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SimController.java

@@ -0,0 +1,83 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.constant.Constants;
+import com.shxy.xymanager_common.entity.SimInfo;
+import com.shxy.xymanager_service.excel.*;
+import com.shxy.xymanager_service.service.SimService;
+import com.shxy.xymanager_service.service.TerminalSimcardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(tags = {"sim卡相关接口"})
+@RequestMapping("sim")
+@Slf4j
+public class SimController extends BaseController {
+
+    @Resource
+    SimService service;
+    @Resource
+    TerminalSimcardService simcardService;
+
+    @PostMapping("importSim")
+    @ApiOperation("导入sim")
+    public ResponseReult<String> importSim(@RequestParam("file") MultipartFile file,
+                                           @RequestParam(value = "type", required = true) Integer type) throws Exception {
+        if (file != null && file.getInputStream() != null) {
+            if (type == Constants.NetType_Dahan) {
+                DahanExcelListener listener = new DahanExcelListener(service);
+                EasyExcel.read(file.getInputStream(), DahanLine.class, listener)
+                        .sheet(0)
+                        .doRead();
+            } else if (type == Constants.NetType_LWWLKJ) {
+                LwwlkjExcelListener listener = new LwwlkjExcelListener(service);
+                EasyExcel.read(file.getInputStream(), LwwlkjLine.class, listener)
+                        .sheet(0)
+                        .doRead();
+            } else if (type == Constants.NetType_M2M10086) {
+                M2mExcelListener listener = new M2mExcelListener(service);
+                EasyExcel.read(file.getInputStream(), M2mLine.class, listener)
+                        .sheet(0)
+                        .doRead();
+            } else if (type == Constants.NetType_Rabchaser) {
+                RabchaserExcelListener listener = new RabchaserExcelListener(service);
+                EasyExcel.read(file.getInputStream(), RabchaserLine.class, listener)
+                        .sheet(0)
+                        .doRead();
+            } else {
+                return ResponseReult.fail("type不正确");
+            }
+            return ResponseReult.success("OK");
+        } else {
+            return ResponseReult.fail("缺少上传文件");
+        }
+    }
+
+    @GetMapping("list")
+    @ApiOperation("查询sim卡")
+    @Log(title = "查询sim卡", type = "查询")
+    public ResponseReult<PageInfo<SimInfo>> list(Integer type, Integer pageNum, Integer pageSize) {
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        PageInfo<SimInfo> result = service.list(type, pageNum, pageSize);
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("syncAll")
+    @ApiOperation("同步所有sim卡数据")
+    public ResponseReult<String> syncAll() {
+        simcardService.syncAll();
+        return ResponseReult.success("OK");
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SmsController.java

@@ -0,0 +1,85 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.model.SmsModel;
+import com.shxy.xymanager_common.model.SmsReturn;
+import com.shxy.xymanager_common.sms.dahan.DahanWeb;
+import com.shxy.xymanager_common.sms.lwwlkj.LwwlkjWeb;
+import com.shxy.xymanager_common.sms.m2m.M2m10086Web;
+import com.shxy.xymanager_common.sms.rabchaser.RabchaserWeb;
+import com.shxy.xymanager_service.service.SmsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+
+@RestController
+@Api(tags = {"短信相关接口"})
+@RequestMapping("sms")
+@Slf4j
+public class SmsController extends BaseController {
+
+    @Resource
+    SmsService service;
+
+    @PostMapping("send")
+    @ApiOperation("发送短信")
+    @Log(title = "发送短信", type = "发送")
+    public ResponseReult<String> send(@Validated @RequestBody SmsModel model) {
+        service.sendSms(model);
+        return ResponseReult.success("OK");
+    }
+
+    @GetMapping("list")
+    @ApiOperation("查询短信")
+    @Log(title = "查询短信", type = "查询")
+    public ResponseReult<SmsReturn> list(Integer termId) {
+        SmsReturn obj = service.listSms(termId);
+        return ResponseReult.success(obj);
+    }
+
+    @PostMapping("netDown")
+    @ApiOperation("断网")
+    @Log(title = "断网", type = "断网")
+    public ResponseReult<String> netDown(@RequestBody SmsModel model) {
+        service.netDown(model);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("netUp")
+    @ApiOperation("恢复上网")
+    @Log(title = "恢复上网", type = "恢复上网")
+    public ResponseReult<String> netUp(@RequestBody SmsModel model) {
+        service.netUp(model);
+        return ResponseReult.success("OK");
+    }
+
+    @GetMapping("getAuth")
+    @ApiOperation("查询授权")
+    public ResponseReult<HashMap<String, String>> getAuth() {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("dahan", DahanWeb.cookie);
+        map.put("rabchaser", RabchaserWeb.authorization);
+        map.put("m2m10086", M2m10086Web.cookie);
+        map.put("lwwlkj", LwwlkjWeb.cookie);
+        return ResponseReult.success(map);
+    }
+
+    @PostMapping("updateAuth")
+    @ApiOperation("更新授权")
+    public ResponseReult<String> updateAuth(@RequestBody HashMap<String, String> map) {
+        DahanWeb.cookie = map.get("dahan");
+        RabchaserWeb.authorization = map.get("rabchaser");
+        M2m10086Web.cookie = map.get("m2m10086");
+        LwwlkjWeb.cookie = map.get("lwwlkj");
+        return ResponseReult.success("OK");
+    }
+
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java

@@ -4,14 +4,14 @@ package com.shxy.xymanager_admin.controller;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
-import com.shxy.xymanager_common.bean.SysUser;
-import com.shxy.xymanager_common.entity.SysUserSession;
-import com.shxy.xymanager_common.model.SysUserModel;
+import com.shxy.xymanager_common.entity.SysUser;
+import com.shxy.xymanager_common.page.TableDataInfo;
 import com.shxy.xymanager_common.vo.PageVo;
 import com.shxy.xymanager_common.vo.SysUserUpdateVo;
 import com.shxy.xymanager_common.vo.SysUserVo;
 import com.shxy.xymanager_service.service.LoginService;
 import com.shxy.xymanager_service.service.SysUserService;
+import com.shxy.xymanager_service.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -31,6 +31,9 @@ public class SysLoginController {
 
     @Autowired
     SysUserService sysUserService;
+    @Autowired
+    UserService userService;
+
 
     /**
      * @Description 登录方法
@@ -41,13 +44,10 @@ public class SysLoginController {
     @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/login")
-    public ResponseReult<SysUserSession> login(@RequestBody SysUser sysUser) {
-        ServiceBody<SysUserSession> serviceBody = loginService.remoteLogin(sysUser);
-        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
-            return ResponseReult.success(serviceBody.getData());
-        } else {
-            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
-        }
+    public ResponseReult<SysUser> login(@RequestBody SysUser sysUser) throws Exception {
+        SysUser user = userService.login(sysUser);
+        user.setPassword(null);
+        return ResponseReult.success(user);
     }
 
     /**
@@ -81,7 +81,6 @@ public class SysLoginController {
         }
     }
 
-
     /**
      * 查询用户列表
      *
@@ -91,8 +90,8 @@ public class SysLoginController {
     @ApiOperation(value = "查询用户列表", notes = "查询用户列表", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/userList")
-    public ResponseReult<SysUserModel> userList(@RequestBody @Validated PageVo vo) {
-        ServiceBody<SysUserModel> serviceBody = sysUserService.selectUserList(vo);
+    public ResponseReult<TableDataInfo<com.shxy.xymanager_common.entity.SysUser>> userList(@RequestBody @Validated PageVo vo) {
+        ServiceBody<TableDataInfo<com.shxy.xymanager_common.entity.SysUser>> serviceBody = sysUserService.selectUserList(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -110,7 +109,7 @@ public class SysLoginController {
     @ApiOperation(value = "删除用户", notes = "删除用户", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/deleteUser")
-    public ResponseReult<String> deleteUser(@RequestParam("uid") String uid) {
+    public ResponseReult<String> deleteUser(@RequestParam("uid") Integer uid) {
         ServiceBody<String> serviceBody = sysUserService.deleteUserById(uid);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java

@@ -5,8 +5,10 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.RequestResults;
 import com.shxy.xymanager_common.model.*;
 import com.shxy.xymanager_common.vo.*;
+import com.shxy.xymanager_framework.timeTask.StoreCameraScheduleTask;
 import com.shxy.xymanager_service.service.TermSetService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +22,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 
 @Api(value = "装置cma控制", tags = "装置cma控制")
 @RestController
@@ -28,6 +32,8 @@ public class TermSetController extends BaseController {
 
     @Autowired
     TermSetService termSetService;
+    @Autowired
+    StoreCameraScheduleTask cameraScheduleTask;
 
     @ApiOperation(value = "声光报警", notes = "声光报警", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@@ -54,4 +60,50 @@ public class TermSetController extends BaseController {
             return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
         }
     }
+
+    @ApiOperation(value = "调整装置焦距", notes = "调整装置焦距", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/updateTermCamera")
+    @Log(title = "调整装置焦距", type = "查询")
+    public ResponseReult<CmaRequestModel> updateTermCamera(UpdateCameraVo vo) {
+        ServiceBody<CmaRequestModel> serviceBody = termSetService.updateTermCamera(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+
+    @ApiOperation(value = "设备控制接口", notes = "设备控制接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/setTermCamera")
+    @Log(title = "设备控制接口", type = "查询")
+    public ResponseReult<CmaRequestModel> setTermCamera(@RequestBody @Validated TermCtrlVo vo) throws Exception {
+        ServiceBody<CmaRequestModel> serviceBody = termSetService.setTermCamera(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "设备控制接口返回查询", notes = "设备控制接口返回查询", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTermCameraRequest")
+    @Log(title = "设备控制接口返回查询", type = "查询")
+    public ResponseReult<CmaRequestBackModel> getTermCameraRequest(@RequestBody @Validated RequestIdVo vo) {
+        ServiceBody<CmaRequestBackModel> serviceBody = termSetService.getTermCameraRequest(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @RequestMapping("/refreshAllCameraSchedule")
+    public ResponseReult<String> refreshAllCameraSchedule() {
+        cameraScheduleTask.search();
+        return ResponseReult.success("OK");
+    }
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalAlarmController.java

@@ -6,7 +6,7 @@ import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
 import com.shxy.xymanager_common.model.*;
-import com.shxy.xymanager_common.util.HeaderUtil;
+import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_service.service.TerminalAlarmService;
 import io.swagger.annotations.Api;
@@ -72,7 +72,6 @@ public class TerminalAlarmController extends BaseController {
         }
     }
 
-
     @ApiOperation(value = "修改告警分类列表", notes = "修改告警分类列表", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/updateAlarmTypeList")
@@ -86,4 +85,30 @@ public class TerminalAlarmController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "七天报警统计", notes = "七天报警统计接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getWeekAlarmStatistics")
+    @Log(title = "七天报警统计", type = "查询")
+    public ResponseReult<TerminalWeekAlarmStatisticsModel> getWeekAlarmStatistics(@Validated WeekAlarmVo vo) {
+        ServiceBody<TerminalWeekAlarmStatisticsModel> serviceBody = terminalAlarmService.getWeekAlarmStatistics(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "当日报警统计", notes = "当日报警统计", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTodayAlarmStatistics")
+    @Log(title = "当日报警统计", type = "查询")
+    public ResponseReult<TerminalTodayAlarmStatisticsModel> getTodayAlarmStatistics(@Validated WeekAlarmVo vo) {
+        ServiceBody<TerminalTodayAlarmStatisticsModel> serviceBody = terminalAlarmService.getTodayAlarmStatistics(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java

@@ -5,8 +5,13 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.*;
+import com.shxy.xymanager_common.excelbean.TerminalAndLastPicListExcelModel;
+import com.shxy.xymanager_common.excelbean.TerminalListExcelModel;
 import com.shxy.xymanager_common.model.*;
-import com.shxy.xymanager_common.util.HeaderUtil;
+import com.shxy.xymanager_common.page.TableDataInfo;
+import com.shxy.xymanager_common.util.EasyExcelUtil;
+import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
 import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_service.service.TerminalService;
 import io.swagger.annotations.Api;
@@ -14,11 +19,16 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 
 @Api(value = "设备接口", tags = "设备接口相关")
 @RestController
@@ -32,8 +42,8 @@ public class TerminalController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getTerminalList")
     @Log(title = "获取设备列表", type = "查询")
-    public ResponseReult<TerminalListModel> getTerminalList(@RequestBody @Validated TerminalSelectVo vo) {
-        ServiceBody<TerminalListModel> serviceBody = terminalService.getTerminalList(vo);
+    public ResponseReult<TableDataInfo<View_Dy_Line_Tower_Terminals>> getTerminalList(@RequestBody @Validated TerminalSelectVo vo) {
+        ServiceBody<TableDataInfo<View_Dy_Line_Tower_Terminals>> serviceBody = terminalService.getTerminalList(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -41,6 +51,15 @@ public class TerminalController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "导出设备列表Excel", notes = "导出设备列表Excel", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTerminalListExcel")
+    @Log(title = "获取设备列表", type = "查询")
+    public void getTerminalListExcel(HttpServletResponse response) throws IOException {
+        ServiceBody<List<TerminalListExcelModel>> serviceBody = terminalService.getTerminalListExcel(null);
+        EasyExcelUtil.createExcel(response, "设备表", serviceBody.getData(), TerminalListExcelModel.class);
+    }
+
     @ApiOperation(value = "获取绘制图标", notes = "绘制坐标保存接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getCoordinate")
@@ -224,4 +243,178 @@ public class TerminalController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "工作状态历史", notes = "工作状态历史", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getWorkingStatusHistory")
+    @Log(title = "工作状态历史", type = "查询")
+    public ResponseReult<TableDataInfo<TerminalWorkingStatusHistory>> getWorkingStatusHistory(@RequestBody TermFaultsVo vo) {
+        ServiceBody<TableDataInfo<TerminalWorkingStatusHistory>> serviceBody = terminalService.getWorkingStatusHistory(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "工作状态历史Excel", notes = "工作状态历史Excel", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @GetMapping("/getWorkingStatusHistoryExcel")
+    @Log(title = "工作状态历史Excel", type = "查询")
+    public void getWorkingStatusHistoryExcel(HttpServletResponse response, TermFaultsVo vo) throws IOException {
+        ServiceBody<TableDataInfo<TerminalWorkingStatusHistory>> serviceBody = terminalService.getWorkingStatusHistory(vo);
+        EasyExcelUtil.createExcel(response, "设备工作状态列表", serviceBody.getData().getList(), TerminalWorkingStatusHistory.class);
+    }
+
+    @ApiOperation(value = "装置统计", notes = "装置统计", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTermStatistics")
+    @Log(title = "装置统计", type = "查询")
+    public ResponseReult<TerminalStatisticsModel> getTermStatistics() {
+        ServiceBody<TerminalStatisticsModel> serviceBody = terminalService.getTermStatistics();
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "获取在线设备列表", notes = "获取在线设备列表接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getOnlineTerminalList")
+    @Log(title = "获取设备列表", type = "查询")
+    public ResponseReult<List<TerminalAndLastPicListExcelModel>> getOnlineTerminalList(@Param("type") Integer type) {
+        ServiceBody<List<TerminalAndLastPicListExcelModel>> serviceBody = terminalService.getOnlineTerminalList(type);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "导出设备在线和心跳时间和照片时间列表Excel", notes = "导出设备在线和心跳时间和照片时间列表Excel", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getOnlineTerminalListExcel")
+    @Log(title = "导出设备在线和心跳时间和照片时间列表Excel", type = "查询")
+    public void getOnlineTerminalListExcel(HttpServletResponse response, @Param("type") Integer type) throws IOException {
+        ServiceBody<List<TerminalAndLastPicListExcelModel>> serviceBody = terminalService.getOnlineTerminalList(type);
+        EasyExcelUtil.createExcel(response, "设备在线表", serviceBody.getData(), TerminalAndLastPicListExcelModel.class);
+    }
+
+    @ApiOperation(value = "获取规约列表", notes = "获取规约列表", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getProtocolList")
+    @Log(title = "获取规约列表", type = "查询")
+    public ResponseReult<ProtocolListModel> getProtocolList() {
+        ServiceBody<ProtocolListModel> serviceBody = terminalService.getProtocolList();
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+
+    @ApiOperation(value = "新增收藏夹接口", notes = "新增收藏夹接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/addFavorList")
+    @Log(title = "新增收藏夹接口", type = "新增")
+    public ResponseReult<String> addFavorList(@RequestBody FavorVo vo) {
+        ServiceBody<String> serviceBody = terminalService.addFavorList(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+
+    @ApiOperation(value = "设备故障接口", notes = "设备故障接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTermFaults")
+    @Log(title = "设备故障接口", type = "查询")
+    public ResponseReult<TableDataInfo<TerminalFaults>> getTermFaults(@RequestBody TermFaultsVo vo) {
+        ServiceBody<TableDataInfo<TerminalFaults>> serviceBody = terminalService.getTermFaults(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "导出设备故障列表Excel", notes = "导出设备列表Excel", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @GetMapping("/getTermFaultsExcel")
+    @Log(title = "获取设备列表", type = "查询")
+    public void getTermFaultsExcel(HttpServletResponse response, TermFaultsVo vo) throws IOException {
+        ServiceBody<TableDataInfo<TerminalFaults>> serviceBody = terminalService.getTermFaults(vo);
+        EasyExcelUtil.createExcel(response, "设备故障列表", serviceBody.getData().getList(), TerminalFaults.class);
+    }
+
+    @ApiOperation(value = "获取设备运行状态历史", notes = "获取设备运行状态历史", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTermRunningHistory")
+    @Log(title = "获取设备运行状态历史", type = "查询")
+    public ResponseReult<TableDataInfo<TerminalRunningStatusHistory>> getTermRunningHistory(@RequestBody TermFaultsVo vo) {
+        ServiceBody<TableDataInfo<TerminalRunningStatusHistory>> serviceBody = terminalService.getTermRunningHistory(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "获取设备运行状态历史Excel", notes = "获取设备运行状态历史Excel", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @GetMapping("/getTermRunningHistoryExcel")
+    @Log(title = "获取设备运行状态历史", type = "查询")
+    public void getTermRunningHistoryExcel(HttpServletResponse response, TermFaultsVo vo) throws IOException {
+        ServiceBody<TableDataInfo<TerminalRunningStatusHistory>> serviceBody = terminalService.getTermRunningHistory(vo);
+        EasyExcelUtil.createExcel(response, "设备运行列表", serviceBody.getData().getList(), TerminalRunningStatusHistory.class);
+    }
+
+    @ApiOperation(value = "获取设备Gps历史", notes = "获取设备Gps历史", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTermGpsHistory")
+    @Log(title = "获取设备Gps历史", type = "查询")
+    public ResponseReult<TableDataInfo<TerminalPositionHistory>> getTermGpsHistory(@RequestBody TermFaultsVo vo) {
+        ServiceBody<TableDataInfo<TerminalPositionHistory>> serviceBody = terminalService.getTermGpsHistory(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "获取设备Gps历史Excel", notes = "获取设备Gps历史Excel", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @GetMapping("/getTermGpsHistoryExcel")
+    @Log(title = "获取设备Gps历史Excel", type = "查询")
+    public void getTermGpsHistoryExcel(HttpServletResponse response, TermFaultsVo vo) throws IOException {
+        ServiceBody<TableDataInfo<TerminalPositionHistory>> serviceBody = terminalService.getTermGpsHistory(vo);
+        EasyExcelUtil.createExcel(response, "设备GPS列表", serviceBody.getData().getList(), TerminalPositionHistory.class);
+    }
+
+
+    @ApiOperation(value = "获取设备基本信息", notes = "获取设备基本信息", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTermBasicInfoHistory")
+    @Log(title = "获取设备基本信息", type = "查询")
+    public ResponseReult<TableDataInfo<TerminalBasicInfoHistory>> getTermBasicInfoHistory(@RequestBody TermFaultsVo vo) {
+        ServiceBody<TableDataInfo<TerminalBasicInfoHistory>> serviceBody = terminalService.getTermBasicInfoHistory(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "获取设备基本信息Excel", notes = "获取设备基本信息Excel", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @GetMapping("/getTermBasicInfoHistoryExcel")
+    @Log(title = "获取设备基本信息Excel", type = "查询")
+    public void getTermBasicInfoHistoryExcel(HttpServletResponse response, TermFaultsVo vo) throws IOException {
+        ServiceBody<TableDataInfo<TerminalBasicInfoHistory>> serviceBody = terminalService.getTermBasicInfoHistory(vo);
+        EasyExcelUtil.createExcel(response, "设备基本信息列表", serviceBody.getData().getList(), TerminalBasicInfoHistory.class);
+    }
+
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalExtController.java

@@ -0,0 +1,439 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.bean.ServiceBody;
+import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.*;
+import com.shxy.xymanager_common.excel.TerminalExcel;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_common.model.*;
+import com.shxy.xymanager_common.util.EasyExcelUtil;
+import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
+import com.shxy.xymanager_common.vo.TerminalPhotoSelectVo;
+import com.shxy.xymanager_common.vo.TerminalSelectVo;
+import com.shxy.xymanager_dao.dao.TerminalPositionsMapper;
+import com.shxy.xymanager_dao.dao.TerminalStatusDao;
+import com.shxy.xymanager_framework.timeTask.ClearCacheTask;
+import com.shxy.xymanager_service.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@Api(tags = {"装置附带额外信息接口"})
+@RequestMapping("terminal")
+@Slf4j
+@Validated
+public class TerminalExtController extends BaseController {
+
+    @Resource
+    TerminalGpsService gpsService;
+    @Resource
+    WeatherService weatherService;
+    @Resource
+    LeadPullsService leadPullsService;
+    @Resource
+    TerminalPhotoService photoService;
+    @Resource
+    TerminalStatusDao terminalStatusDao;
+    @Resource
+    TerminalPositionsMapper terminalPositionsMapper;
+    @Resource
+    TerminalBasicInfoHistoryService infoHistoryService;
+    @Resource
+    HeartbeatService heartbeatService;
+    @Resource
+    TerminalExtService terminalExtService;
+    @Resource
+    TerminalSimcardService simcardService;
+    @Resource
+    CameraScheduleService cameraScheduleService;
+    @Resource
+    ClearCacheTask clearCacheTask;
+
+    @GetMapping("clearCache")
+    @ApiOperation("清空缓存")
+    public ResponseReult<String> clearCache() {
+        clearCacheTask.clearAllCache();
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("batchUpdate")
+    @ApiOperation("批量修改装置")
+    @Log(title = "批量修改装置", type = "修改")
+    public ResponseReult<String> batchUpdate(@RequestBody BatchUpdateModel model) throws Exception {
+        if (model.getNewLineId() == null) {
+            throw new ApiException("newLineId不能为空");
+        }
+        if (CollectionUtils.isEmpty(model.getTermIds())) {
+            throw new ApiException("termIds不能为空");
+        }
+        terminalExtService.batchUpdate(model);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("importTerminal")
+    @ApiOperation("导入装置")
+    @Log(title = "导入装置", type = "导入")
+    public ResponseReult<String> importTerminal(@Validated @RequestBody UploadModel model) throws Exception {
+        terminalExtService.importTerminal(model);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("updateComment")
+    @ApiOperation("修改备注")
+    @Log(title = "修改备注", type = "修改")
+    public ResponseReult<String> updateComment(@RequestBody MntnStatus model) throws Exception {
+        terminalExtService.updateComment(model);
+        return ResponseReult.success("OK");
+    }
+
+    @GetMapping("listReport")
+    @ApiOperation("查询运维数据历史")
+    @Log(title = "查询运维数据历史", type = "查询")
+    public ResponseReult<PageInfo<MntnRawReports>> listReport(Integer termId, Integer pageNum, Integer pageSize) {
+        if (termId == null) {
+            throw new ApiException("termId不能为空");
+        }
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        PageInfo<MntnRawReports> result = terminalExtService.listReport(termId, pageNum, pageSize);
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("listForMaintain")
+    @ApiOperation("运维查询装置")
+    @Log(title = "运维查询装置", type = "查询")
+    public ResponseReult<List<View_Dy_Line_Tower_Terminals>> listForMaintain(TerminalSelectVo vo) {
+        vo.setPageindex(1);
+        vo.setPagesize(10000);
+        List<View_Dy_Line_Tower_Terminals> result = terminalExtService.getExtTerminalList(vo);
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("exportForMaintain")
+    @ApiOperation("导出运维")
+    @Log(title = "导出运维", type = "导出")
+    public void exportForMaintain(TerminalSelectVo vo, HttpServletResponse response) throws Exception {
+        vo.setPageindex(1);
+        vo.setPagesize(10000);
+        List<View_Dy_Line_Tower_Terminals> result = terminalExtService.getExtTerminalList(vo);
+        List<TerminalExcel> list = new ArrayList<>();
+        for (View_Dy_Line_Tower_Terminals term : result) {
+            TerminalExcel item = TerminalExcel.from(term);
+            list.add(item);
+        }
+        EasyExcelUtil.createExcel(response, "运维数据", list, TerminalExcel.class);
+    }
+
+    @PostMapping("statMaintain")
+    @ApiOperation("运维统计")
+    @Log(title = "运维统计", type = "统计")
+    public ResponseReult<List<StatMaintain>> statMaintain(StatModel model) throws Exception {
+        if (model.getStart() == null) {
+            throw new ApiException("start不能为空");
+        }
+        if (model.getEnd() == null) {
+            throw new ApiException("end不能为空");
+        }
+        if (model.getLineIds() == null) {
+            throw new ApiException("lineIds不能为空");
+        }
+        List<StatMaintain> result = terminalExtService.statMaintain(model);
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("listWithAll")
+    @ApiOperation("查询附带全部额外信息")
+    @Log(title = "装置查询附带全部额外信息", type = "查询")
+    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithAll(Integer dyId, Integer lineId, Integer towerId, Integer termId, String search,
+                                                                             Integer isonline, Integer protocol, Integer devType, String cmdid,
+                                                                             Long start, Long end,
+                                                                             Integer channelId, Integer activityId, String dataFlag,
+                                                                             Integer pageNum, Integer pageSize) {
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        if (dataFlag == null) {
+            dataFlag = "";
+        }
+        long cost = System.currentTimeMillis();
+        PageInfo<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalPage(dyId, lineId, towerId, termId,
+                search, cmdid,
+                isonline, protocol, devType, activityId,
+                pageNum, pageSize);
+        cost = System.currentTimeMillis() - cost;
+        log.info("getTerminalList cost=" + cost);
+        if (!CollectionUtils.isEmpty(result.getList())) {
+            cost = System.currentTimeMillis();
+            List<Integer> terminalIds = new ArrayList<>();
+            for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
+                terminalIds.add(terminal.getId());
+                if (dataFlag.contains("P")) {
+                    PhotoDayModel photoInfo = photoService.getDayModel(terminal.getId(), channelId, start, end);
+                    terminal.setPhotoInfo(photoInfo);
+                }
+                if (dataFlag.contains("C")) {
+                    long rebootCount = infoHistoryService.count(terminal.getId(), start, end);
+                    terminal.setRebootCount(rebootCount);
+                }
+                if (dataFlag.contains("B")) {
+                    TerminalBasicInfoHistory info = infoHistoryService.getLast(terminal.getId());
+                    terminal.setLastInfo(info);
+                }
+            }
+
+            if (dataFlag.contains("S")) {
+                TerminalStatusExample example = new TerminalStatusExample();
+                TerminalStatusExample.Criteria criteria = example.createCriteria();
+                criteria.andTermIdIn(terminalIds);
+                List<TerminalStatus> terminalStatuses = terminalStatusDao.selectByExample(example);
+                for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
+                    for (TerminalStatus terminalStatus : terminalStatuses) {
+                        if (terminal.getId().intValue() == terminalStatus.getTermId().intValue()) {
+                            terminal.setWorkingStatus(terminalStatus);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (dataFlag.contains("O")) {
+                TerminalPositionsExample example = new TerminalPositionsExample();
+                TerminalPositionsExample.Criteria criteria = example.createCriteria();
+                criteria.andTermIdIn(terminalIds);
+                List<TerminalPositions> terminalPositions = terminalPositionsMapper.selectByExample(example);
+                for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
+                    for (TerminalPositions terminalPosition : terminalPositions) {
+                        if (terminal.getId().intValue() == terminalPosition.getTermId().intValue()) {
+                            terminal.setPositions(terminalPosition);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            cost = System.currentTimeMillis() - cost;
+            log.info("listWithAll cost=" + cost);
+        }
+        return ResponseReult.success(result);
+    }
+
+
+    @GetMapping("listWithWeather")
+    @ApiOperation("查询附带天气")
+    @Log(title = "覆冰查询附带天气", type = "查询")
+    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithWeather(Integer dyId, Integer lineId, Integer towerId, Integer termId, String search,
+                                                                                 Integer isonline, Integer protocol, Integer devType,
+                                                                                 Integer pageNum, Integer pageSize) {
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        PageInfo<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalPage(dyId, lineId, towerId, termId,
+                search, null,
+                isonline, protocol, devType, null,
+                pageNum, pageSize);
+        if (!CollectionUtils.isEmpty(result.getList())) {
+            for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
+                Weathers last = weatherService.getLast(terminal.getId());
+                if (last != null) {
+                    last.setCmdid(terminal.getCmdid());
+                    last.setPhase(terminal.getPhase());
+                    terminal.setLastWeathers(last);
+                }
+            }
+        }
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("listWithLeadPull")
+    @ApiOperation("查询附带拉力")
+    @Log(title = "覆冰查询附带拉力", type = "查询")
+    public ResponseReult<PageInfo<View_Dy_Line_Tower_Terminals>> listWithLeadPull(Integer dyId, Integer lineId, Integer towerId, Integer termId, String search,
+                                                                                  Integer isonline, Integer protocol, Integer devType,
+                                                                                  Integer pageNum, Integer pageSize) {
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        PageInfo<View_Dy_Line_Tower_Terminals> result = terminalExtService.getTerminalPage(dyId, lineId, towerId, termId,
+                search, null,
+                isonline, protocol, devType, null,
+                pageNum, pageSize);
+        if (!CollectionUtils.isEmpty(result.getList())) {
+            for (View_Dy_Line_Tower_Terminals terminal : result.getList()) {
+                LeadPulls last = leadPullsService.getLast(terminal.getId());
+                if (last != null) {
+                    last.setCmdid(terminal.getCmdid());
+                    last.setPhase(terminal.getPhase());
+                    terminal.setLastLeadPulls(last);
+                }
+            }
+        }
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("heartbeat")
+    @ApiOperation("心跳历史")
+    @Log(title = "查询心跳历史", type = "查询")
+    public ResponseReult<PageInfo<TerminalHeartbeatHistory>> heartbeat(Integer termId, Integer pageNum, Integer pageSize) {
+        pageNum = this.initPageNum(pageNum);
+        pageSize = this.initPageSize(pageSize);
+        PageInfo<TerminalHeartbeatHistory> list = heartbeatService.listAll(termId, pageNum, pageSize);
+        return ResponseReult.success(list);
+    }
+
+    @GetMapping("getSimcard")
+    @ApiOperation("查询Simcard数据")
+    @Log(title = "查询Simcard数据", type = "查询")
+    public ResponseReult<TerminalSimcard> getSimcard(Integer termId) {
+        if (termId == null) {
+            throw new ApiException("termId不能为空");
+        }
+        TerminalSimcard simcard = simcardService.getSimcard(termId);
+        return ResponseReult.success(simcard);
+    }
+
+    @PostMapping("updateSimcard")
+    @ApiOperation("修改Simcard数据")
+    @Log(title = "修改Simcard数据", type = "修改")
+    public ResponseReult<String> updateSimcard(@RequestBody TerminalSimcard model) throws Exception {
+        simcardService.updateSimcard(model);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("importIccidForMaintain")
+    @ApiOperation("比对运维后导入iccid")
+    @Log(title = "比对运维后导入iccid", type = "导入")
+    public ResponseReult<String> importIccidForMaintain(@Validated @RequestBody IccidModel model) throws Exception {
+        TerminalSelectVo vo = new TerminalSelectVo();
+        vo.setPageindex(1);
+        vo.setPagesize(10000);
+        List<View_Dy_Line_Tower_Terminals> list = terminalExtService.getExtTerminalList(vo);
+        for (View_Dy_Line_Tower_Terminals item : list) {
+            MntnStatus mntnStatus = item.getMntnStatus();
+            if (mntnStatus != null && mntnStatus.getReportMap() != null) {
+                HashMap<String, Object> reportMap = mntnStatus.getReportMap();
+                String iccid1 = (String) reportMap.get("simcard1");
+                String iccid2 = (String) reportMap.get("simcard2");
+                if (iccid2 != null && model.getIccidList().contains(iccid2)) {
+                    TerminalSimcard simcard = new TerminalSimcard();
+                    simcard.setTermId(item.getId());
+                    simcard.setIccid2(iccid2);
+                    simcard.setType2(model.getType());
+                    simcardService.updateSimcard(simcard);
+                } else if (iccid1 != null && model.getIccidList().contains(iccid1)) {
+                    TerminalSimcard simcard = new TerminalSimcard();
+                    simcard.setTermId(item.getId());
+                    simcard.setIccid2(iccid1);
+                    simcard.setType2(model.getType());
+                    simcardService.updateSimcard(simcard);
+                }
+            }
+        }
+        return ResponseReult.success("OK");
+    }
+
+    @ApiOperation(value = "图片覆冰天气的按时间表统计", notes = "图片覆冰天气的按时间表统计接口", httpMethod = "POST")
+    @RequestMapping("/getScheduleStat")
+    @Log(title = "图片覆冰天气的按时间表统计", type = "统计")
+    public ResponseReult<List<StatTerm>> getScheduleStat(@RequestHeader HttpHeaders headers, @RequestBody @Validated TerminalPhotoSelectVo vo) throws Exception {
+        String requestIp = HeaderUtil.getRequestIp(headers);
+        vo.setPageindex(1);
+        vo.setPagesize(100000);
+        if (vo.getInterval() == null) {
+            vo.setInterval(10);
+        }
+        List<StatTerm> termList = new ArrayList<>();
+        ServiceBody<TerminalPhotoSelectListModel> serviceBody = photoService.getPhotoList(requestIp, vo, termList);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            TerminalPhotoSelectListModel model = serviceBody.getData();
+            List<Integer> idList = new ArrayList<>();
+            for (StatTerm st : termList) {
+                idList.add(st.getTermId());
+            }
+            if (idList.size() < 1) {
+                idList.add(-1);
+            }
+
+            this.buildPhotoStat(termList, idList, model.getList(), vo);
+
+            PageInfo<Weathers> weatherPage = weatherService.list(null, null, idList,
+                    vo.getStarttime().getTime() / 1000, vo.getEndtime().getTime() / 1000, 1, 100000);
+            if (!CollectionUtils.isEmpty(weatherPage.getList())) {
+                for (Weathers weather : weatherPage.getList()) {
+                    StatTerm term = this.findStatTerm(termList, weather.getTermId(), weather.getCmdid());
+                    term.addWeather(weather);
+                }
+            }
+            PageInfo<LeadPulls> pullPage = leadPullsService.list(null, null, idList,
+                    vo.getStarttime().getTime() / 1000, vo.getEndtime().getTime() / 1000, 1, 100000);
+            if (!CollectionUtils.isEmpty(pullPage.getList())) {
+                for (LeadPulls pull : pullPage.getList()) {
+                    StatTerm term = this.findStatTerm(termList, pull.getTermId(), pull.getCmdid());
+                    term.addLeadPulls(pull);
+                }
+            }
+            return ResponseReult.success(termList);
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    private void buildPhotoStat(List<StatTerm> termList, List<Integer> idList,
+                                List<TerminalPhotoSelectListModel.PhotoBean> list, TerminalPhotoSelectVo vo) throws Exception {
+        for (StatTerm statTerm : termList) {
+            List<CameraSchedule> scheduleList = cameraScheduleService.list(statTerm.getTermId());
+            statTerm.initScheduleList(scheduleList, vo.getStarttime().getTime(), vo.getEndtime().getTime(), vo.getInterval());
+
+            long rebootCount = infoHistoryService.count(statTerm.getTermId(), vo.getStarttime().getTime() / 1000, vo.getEndtime().getTime() / 1000);
+            statTerm.setRebootCount(rebootCount);
+            TerminalBasicInfoHistory info = infoHistoryService.getLast(statTerm.getTermId());
+            statTerm.setLastInfo(info);
+        }
+        TerminalStatusExample example = new TerminalStatusExample();
+        TerminalStatusExample.Criteria criteria = example.createCriteria();
+        criteria.andTermIdIn(idList);
+        List<TerminalStatus> terminalStatuses = terminalStatusDao.selectByExample(example);
+        for (StatTerm item : termList) {
+            for (TerminalStatus terminalStatus : terminalStatuses) {
+                if (item.getTermId() == terminalStatus.getTermId().intValue()) {
+                    item.setWorkingStatus(terminalStatus);
+                    break;
+                }
+            }
+        }
+        if (list != null) {
+            for (TerminalPhotoSelectListModel.PhotoBean photo : list) {
+                StatTerm term = this.findStatTerm(termList, photo.getTermid(), photo.getCmdid());
+                term.addPhoto(photo);
+            }
+        }
+    }
+
+    private StatTerm findStatTerm(List<StatTerm> list, Integer termId, String cmdid) {
+        StatTerm the = null;
+        for (StatTerm item : list) {
+            if (item.getTermId() == termId) {
+                the = item;
+                break;
+            }
+        }
+        if (the == null) {
+            the = new StatTerm();
+            the.setTermId(termId);
+            the.setCmdid(cmdid);
+            list.add(the);
+        }
+        return the;
+    }
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java

@@ -5,9 +5,15 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.CameraSchedule;
+import com.shxy.xymanager_common.excel.PhotoStatExcel;
+import com.shxy.xymanager_common.exception.ApiException;
 import com.shxy.xymanager_common.model.*;
-import com.shxy.xymanager_common.util.HeaderUtil;
+import com.shxy.xymanager_common.util.DateUtil;
+import com.shxy.xymanager_common.util.EasyExcelUtil;
+import com.shxy.xymanager_common.util.xinyin.HeaderUtil;
 import com.shxy.xymanager_common.vo.*;
+import com.shxy.xymanager_service.service.CameraScheduleService;
 import com.shxy.xymanager_service.service.TerminalPhotoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -17,12 +23,17 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
+
+import java.util.HashMap;
 
 
 @Api(value = "图片接口", tags = "图片接口相关")
@@ -32,6 +43,8 @@ public class TerminalPhotoController extends BaseController {
 
     @Autowired
     TerminalPhotoService terminalPhotoService;
+    @Resource
+    CameraScheduleService cameraScheduleService;
 
     @ApiOperation(value = "获取图片列表", notes = "获取图片列表接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@@ -49,10 +62,10 @@ public class TerminalPhotoController extends BaseController {
 
     @ApiOperation(value = "主动拍照", notes = "主动拍照接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/getLatestPhoto")
+    @RequestMapping("/takePic")
     @Log(title = "主动拍照", type = "查询")
-    public ResponseReult<Date> getLatestPhoto(@RequestBody @Validated TerminalPhotoVo vo) {
-        ServiceBody<Date> serviceBody = terminalPhotoService.getLatestPhoto(vo);
+    public ResponseReult<TakePIcModel> takePic(@Validated TerminalPhotoVo vo) throws Exception {
+        ServiceBody<TakePIcModel> serviceBody = terminalPhotoService.takePic(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -60,12 +73,13 @@ public class TerminalPhotoController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "拍照时间表查询触发", notes = "拍照时间表查询触发", httpMethod = "POST")
+    @ApiOperation(value = "获取检测设备图片列表", notes = "获取检测设备图片列表", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/selectPhotoTimeGet")
-    @Log(title = "拍照时间表查询触发", type = "查询")
-    public ResponseReult<GetModel> selectPhotoTimeGet(@RequestBody @Validated TerminalPhotoTimeGetVo vo) {
-        ServiceBody<GetModel> serviceBody = terminalPhotoService.selectPhotoTimeGet(vo);
+    @RequestMapping("/getTestTerminalPhotoList")
+    @Log(title = "获取检测设备图片列表", type = "查询")
+    public ResponseReult<TerminalPhotoListModel> getTestTerminalPhotoList(@RequestHeader HttpHeaders headers) {
+        String requestIp = HeaderUtil.getRequestIp(headers);
+        ServiceBody<TerminalPhotoListModel> serviceBody = terminalPhotoService.getTestTerminalPhotoList(requestIp);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -73,12 +87,70 @@ public class TerminalPhotoController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "拍照时间表查询", notes = "拍照时间表查询", httpMethod = "POST")
+
+    @ApiOperation(value = "告警划线", notes = "告警划线", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/selectPhotoTime")
-    @Log(title = "拍照时间表查询", type = "查询")
-    public ResponseReult<TerminalScheduleRuleTimeListModel> selectPhotoTime(@RequestBody @Validated TerminalReqPhotoTimeVo vo) {
-        ServiceBody<TerminalScheduleRuleTimeListModel> serviceBody = terminalPhotoService.selectPhotoTime(vo);
+    @RequestMapping("/takeAlarm")
+    @Log(title = "告警划线", type = "查询")
+    public ResponseReult<String> takeAlarm(@Validated @RequestBody TerminalPhotoTestVo vo) {
+        ServiceBody<String> serviceBody = terminalPhotoService.takeAlarm(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    HashMap<Integer, String> workingMap = new HashMap<>();
+
+    @ApiOperation(value = "主动拍照下发状态查询", notes = "主动拍照下发状态查询接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTakePicStatus")
+    @Log(title = "主动拍照下发状态查询", type = "查询")
+    public ResponseReult<TakePIcStatusModel> getTakePicStatus(@Validated ReturnedPhotoVo vo) {
+        try {
+            if (workingMap.containsKey(vo.getRequestid())) {
+                throw new ApiException("相同请求正在处理中, 请刷新页面更新");
+            }
+            workingMap.put(vo.getRequestid(), "1");
+            ServiceBody<TakePIcStatusModel> serviceBody = terminalPhotoService.getTakePicStatus(vo);
+            if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+                return ResponseReult.success(serviceBody.getData());
+            } else {
+                return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+            }
+        } finally {
+            workingMap.remove(vo.getRequestid());
+        }
+    }
+
+    @ApiOperation(value = "主动拍照下照片状态查询", notes = "主动拍照下照片状态查询接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/getTakePicPhotoStatus")
+    @Log(title = "主动拍照下照片状态查询", type = "查询")
+    public ResponseReult<Boolean> getTakePicPhotoStatus(@Validated ReturnedPhotoVo vo) {
+        try {
+            if (workingMap.containsKey(vo.getRequestid())) {
+                throw new ApiException("相同请求正在处理中, 请刷新页面更新");
+            }
+            workingMap.put(vo.getRequestid(), "1");
+            ServiceBody<Boolean> serviceBody = terminalPhotoService.getTakePicPhotoStatus(vo);
+            if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+                return ResponseReult.success(serviceBody.getData());
+            } else {
+                return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+            }
+        } finally {
+            workingMap.remove(vo.getRequestid());
+        }
+    }
+
+    @ApiOperation(value = "拍照时间表查询触发", notes = "拍照时间表查询触发", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/selectPhotoTimeGet")
+    @Log(title = "拍照时间表查询触发", type = "查询")
+    public ResponseReult<GetModel> selectPhotoTimeGet(@RequestBody @Validated TerminalPhotoTimeGetVo vo) {
+        ServiceBody<GetModel> serviceBody = terminalPhotoService.selectPhotoTimeGet(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -92,7 +164,8 @@ public class TerminalPhotoController extends BaseController {
     @Log(title = "图片查询", type = "查询")
     public ResponseReult<TerminalPhotoSelectListModel> getPhotoList(@RequestHeader HttpHeaders headers, @RequestBody @Validated TerminalPhotoSelectVo vo) {
         String requestIp = HeaderUtil.getRequestIp(headers);
-        ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getPhotoList(requestIp, vo);
+        List<StatTerm> termList = new ArrayList<>();
+        ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getPhotoList(requestIp, vo, termList);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -100,19 +173,186 @@ public class TerminalPhotoController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "最新图片查询", notes = "图片查询接口", httpMethod = "POST")
-    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/getReturnedPhoto")
-    @Log(title = "最新图片查询", type = "查询")
-    public ResponseReult<Boolean> getReturnedPhoto(@RequestBody @Validated ReturnedPhotoVo vo) {
-        ServiceBody<Boolean> serviceBody = terminalPhotoService.getReturnedPhoto(vo);
+    @ApiOperation(value = "图片统计查询", notes = "图片统计查询接口", httpMethod = "POST")
+    @RequestMapping("/getPhotoStat")
+    @Log(title = "图片统计查询", type = "查询")
+    public ResponseReult<List<StatTerm>> getPhotoStat(@RequestHeader HttpHeaders headers, @RequestBody @Validated TerminalPhotoSelectVo vo) throws Exception {
+        String requestIp = HeaderUtil.getRequestIp(headers);
+        vo.setPageindex(1);
+        vo.setPagesize(100000);
+        if (vo.getInterval() == null) {
+            vo.setInterval(10);
+        }
+        List<StatTerm> termList = new ArrayList<>();
+        ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getPhotoList(requestIp, vo, termList);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
-            return ResponseReult.success(serviceBody.getData());
+            TerminalPhotoSelectListModel model = serviceBody.getData();
+            this.buildPhotoStat(termList, model.getList(), vo);
+            return ResponseReult.success(termList);
         } else {
             return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
         }
     }
 
+    private void buildPhotoStat(List<StatTerm> termList, List<TerminalPhotoSelectListModel.PhotoBean> list, TerminalPhotoSelectVo vo) throws Exception {
+        for (StatTerm statTerm : termList) {
+            List<CameraSchedule> scheduleList = cameraScheduleService.list(statTerm.getTermId());
+            statTerm.initScheduleList(scheduleList, vo.getStarttime().getTime(), vo.getEndtime().getTime(), vo.getInterval());
+        }
+        if (list != null) {
+            for (TerminalPhotoSelectListModel.PhotoBean photo : list) {
+                StatTerm term = this.findStatTerm(termList, photo);
+                term.addPhoto(photo);
+            }
+        }
+    }
+
+    private StatTerm findStatTerm(List<StatTerm> list, TerminalPhotoSelectListModel.PhotoBean photo) {
+        StatTerm the = null;
+        for (StatTerm item : list) {
+            if (item.getTermId() == photo.getTermid()) {
+                the = item;
+                break;
+            }
+        }
+        if (the == null) {
+            the = new StatTerm();
+            the.setTermId(photo.getTermid());
+            the.setCmdid(photo.getCmdid());
+            list.add(the);
+        }
+        return the;
+    }
+
+//    @ApiOperation(value = "图片统计导出", notes = "图片统计导出接口", httpMethod = "POST")
+//    @RequestMapping("/exportPhotoStat")
+//    @Log(title = "图片统计导出", type = "导出")
+//    public void exportPhotoStat(@RequestHeader HttpHeaders headers,
+//                                @RequestBody @Validated TerminalPhotoSelectVo vo,
+//                                HttpServletResponse response) throws Exception {
+//        String requestIp = HeaderUtil.getRequestIp(headers);
+//        vo.setPageindex(1);
+//        vo.setPagesize(100000);
+//        List<StatTerm> termList = new ArrayList<>();
+//        ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getPhotoList(requestIp, vo, termList);
+//        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+//            TerminalPhotoSelectListModel model = serviceBody.getData();
+//            this.buildPhotoStat(termList, model.getList());
+//
+//            response.setContentType("application/vnd.ms-excel");
+//            response.setCharacterEncoding("utf-8");
+//            response.setHeader("Content-Disposition", "attachment; filename="
+//                    + URLEncoder.encode("照片统计.xlsx", "UTF-8"));
+//            EasyExcelUtil.exportPhotoStat(termList, response.getOutputStream());
+//        }
+//    }
+
+//    @ApiOperation(value = "图片统计导出合计", notes = "图片统计导出合计接口", httpMethod = "POST")
+//    @RequestMapping("/exportPhotoStatSum")
+//    @Log(title = "图片统计导出合计", type = "导出")
+//    public void exportPhotoStatSum(@RequestHeader HttpHeaders headers,
+//                                   @RequestBody @Validated TerminalPhotoSelectVo vo,
+//                                   HttpServletResponse response) throws Exception {
+//        String requestIp = HeaderUtil.getRequestIp(headers);
+//        vo.setPageindex(1);
+//        vo.setPagesize(100000);
+//        List<StatTerm> termList = new ArrayList<>();
+//        ServiceBody<TerminalPhotoSelectListModel> serviceBody = terminalPhotoService.getPhotoList(requestIp, vo, termList);
+//        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+//            TerminalPhotoSelectListModel model = serviceBody.getData();
+//            this.buildPhotoStat(termList, model.getList());
+//            List<PhotoStatExcel> result = this.buildPhotoStatExcel(termList);
+//
+//            EasyExcelUtil.createExcel(response, "图片统计合计", result, PhotoStatExcel.class);
+//        }
+//    }
+
+//    private List<PhotoStatExcel> buildPhotoStatExcel(List<StatTerm> list) {
+//        List<PhotoStatExcel> result = new ArrayList<>();
+//        for (StatTerm term : list) {
+//            PhotoStatExcel item = new PhotoStatExcel();
+//            item.setCmdid(term.getCmdid());
+//            item.setTotal(term.getTotal());
+//            result.add(item);
+//            if (term.getWrongCount() > 0) {
+//                item.setStatus("有异常");
+//            } else {
+//                item.setStatus("正常");
+//            }
+//            for (StatChannel channel : term.getChannels()) {
+//                PhotoStatExcel item2 = new PhotoStatExcel();
+//                item2.setChannelId(channel.getChannelId());
+//                item2.setTotal(channel.getTotal());
+//                result.add(item2);
+//                if (channel.getWrongCount() > 0) {
+//                    item2.setStatus("有异常");
+//                } else {
+//                    item2.setStatus("正常");
+//                }
+//                for (StatPreset preset : channel.getPresets()) {
+//                    PhotoStatExcel item3 = new PhotoStatExcel();
+//                    item3.setChannelId(channel.getChannelId());
+//                    item3.setPresetId(preset.getPresetId());
+//                    item3.setTotal(preset.getTotal());
+//                    result.add(item3);
+//                    if (preset.getWrongCount() > 0) {
+//                        item3.setStatus("有异常");
+//                    } else {
+//                        item3.setStatus("正常");
+//                    }
+//                    for (StatHour hour : preset.getHours()) {
+//                        if (hour.isWrong()) {
+//                            PhotoStatExcel err = new PhotoStatExcel();
+//                            err.setChannelId(channel.getChannelId());
+//                            err.setPresetId(preset.getPresetId());
+//                            err.setHour(hour.getHour());
+//                            List<String> dateList = new ArrayList<>();
+//                            for (Date date : hour.getTimeList()) {
+//                                dateList.add(DateUtil.format(date));
+//                            }
+//                            err.setTotal(dateList.size());
+//                            err.setStatus(hour.getWrongDetail());
+//                            err.setDetail(String.join(System.lineSeparator(), dateList));
+//                            result.add(err);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        return result;
+//    }
+
+    @PostMapping("uploadPhoto")
+    @ApiOperation("上传图片")
+    @Log(title = "上传图片", type = "上传")
+    public ResponseReult<String> uploadPhoto(@RequestParam("files") MultipartFile[] files,
+                                             @RequestParam("cmdid") String cmdid) throws Exception {
+        if (files != null && files.length > 0) {
+            terminalPhotoService.uploadPhotos(files, cmdid);
+            return ResponseReult.success("OK");
+        } else {
+            return ResponseReult.error("缺少上传文件");
+        }
+    }
+
+    @PostMapping("uploadPatch")
+    @ApiOperation("上传图片差分")
+    @Log(title = "上传图片差分", type = "上传")
+    public ResponseReult<String> uploadPatch(@RequestParam("files") MultipartFile[] files,
+                                             @RequestParam("cmdid") String cmdid,
+                                             @RequestParam("oids") Integer[] oids) throws Exception {
+        if (files != null && files.length > 0) {
+            if (oids != null && oids.length > 0 && files.length == oids.length) {
+                terminalPhotoService.uploadPatchs(files, oids, cmdid);
+                return ResponseReult.success("OK");
+            } else {
+                return ResponseReult.error("oids和文件不匹配");
+            }
+        } else {
+            return ResponseReult.error("缺少上传文件");
+        }
+    }
+
     @ApiOperation(value = "图片轮询", notes = "图片轮询接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getPhotoBanner")
@@ -166,7 +406,6 @@ public class TerminalPhotoController extends BaseController {
         }
     }
 
-
     @ApiOperation(value = "历史图片", notes = "历史图片接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getHistoryList")
@@ -181,4 +420,17 @@ public class TerminalPhotoController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "删除图片", notes = "删除图片接口", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/deletePicList")
+    @Log(title = "删除图片", type = "删除")
+    public ResponseReult<String> deletePicList(@RequestBody @Validated DeletePicVo vo) {
+        ServiceBody<String> serviceBody = terminalPhotoService.deletePicList(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPresetController.java

@@ -0,0 +1,59 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.TerminalPresets;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_service.service.TerminalPresetsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@Api(tags = {"装置预置位相关接口"})
+@RequestMapping("preset")
+@Slf4j
+public class TerminalPresetController extends BaseController {
+
+    @Resource
+    TerminalPresetsService service;
+
+    @GetMapping("list")
+    @ApiOperation("查询列表")
+    @Log(title = "查询装置预置位列表", type = "查询")
+    public ResponseReult<List<TerminalPresets>> list(@RequestParam(value = "termId", required = true) Integer termId) {
+        List<TerminalPresets> result = service.list(termId);
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("save")
+    @ApiOperation("保存")
+    @Log(title = "保存装置预置位", type = "保存")
+    public ResponseReult<String> save(@Validated @RequestBody TerminalPresets item) throws Exception {
+        service.save(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    @Log(title = "删除装置预置位", type = "删除")
+    public ResponseReult<String> delete(@Validated @NotNull(message = "termId不能为空!") Integer termId,
+                                        @Validated @NotNull(message = "presetNo不能为空!") Integer presetNo) throws Exception {
+        if (termId == null) {
+            throw new ApiException("termId不能为空!");
+        }
+        if (presetNo == null) {
+            throw new ApiException("presetNo不能为空!");
+        }
+        service.delete(termId, presetNo);
+        return ResponseReult.success("OK");
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TestController.java

@@ -1,57 +1,36 @@
 package com.shxy.xymanager_admin.controller;
 
-import com.shxy.xymanager_common.annotation.Log;
+
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_framework.socket.WebSocketServer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 
-@Api(value = "测试接口", tags = "测试接口tags")
-@Controller
+@RestController
+@Api(tags = {"测试接口"})
+@RequestMapping("test")
 @Slf4j
-public class TestController {
+public class TestController extends BaseController {
 
-    @ApiOperation(value = "测试", notes = "测试notes", httpMethod = "POST")
-    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/user/login")
-    @Log(title = "测试", type = "查询")
-    public String gettest() {
-        log.info("有一个沙雕点了链接");
-        return "/api/index2";
-    }
+    @Resource
+    WebSocketServer webSocketServer;
 
-    @GetMapping("/user/logins")
-    @Log(title = "测试", type = "查询")
-    public String hhtest() {
-        log.info("有一个沙雕点了链接");
-        return "/api/index2.html";
+    @GetMapping("sendMsg")
+    @ApiOperation("发送消息")
+    public void sendMsg(String msg) {
+        webSocketServer.sendNotice(null, msg);
     }
 
-//    @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST")
-////    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-//    @RequestMapping("/login")
-//    @Log(title = "登录", type = "查询")
-//    public String login(String username, String password) {
-//        //获取主题对象
-//        Subject subject = SecurityUtils.getSubject();
-//        try {
-//            subject.login(new UsernamePasswordToken(username,password));
-//            System.out.println("登录成功！！！");
-//            return "登录成功";
-//        } catch (UnknownAccountException e) {
-//            e.printStackTrace();
-//            System.out.println("用户错误！！！");
-//        } catch (IncorrectCredentialsException e) {
-//            System.out.println("密码错误！！！");
-//        }
-//        return "登录失败";
-//    }
-
+    @GetMapping("test")
+    @ApiOperation("test")
+    public ResponseReult<String> test() {
+        return ResponseReult.success("OK");
+    }
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TowerController.java

@@ -8,10 +8,7 @@ import com.shxy.xymanager_common.bean.ServiceStatus;
 import com.shxy.xymanager_common.dto.TowerDto;
 import com.shxy.xymanager_common.model.AllTowerListModel;
 import com.shxy.xymanager_common.model.TowerListModel;
-import com.shxy.xymanager_common.vo.PageVo;
-import com.shxy.xymanager_common.vo.TowerIdVo;
-import com.shxy.xymanager_common.vo.TowersVo;
-import com.shxy.xymanager_common.vo.UpdateTowerVo;
+import com.shxy.xymanager_common.vo.*;
 import com.shxy.xymanager_service.service.TowerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,7 +48,7 @@ public class TowerController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/getTowerList")
     @Log(title = "获取杆塔列表", type = "查询")
-    public ResponseReult<TowerListModel> getTowerList(@RequestBody @Validated PageVo vo) {
+    public ResponseReult<TowerListModel> getTowerList(@RequestBody @Validated SelectVo vo) {
         ServiceBody<TowerListModel> serviceBody = towerService.getTowerList(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
@@ -113,4 +110,5 @@ public class TowerController extends BaseController {
     }
 
 
+
 }

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpPhotoController.java

@@ -0,0 +1,45 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.bean.ServiceBody;
+import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_service.service.TerminalPhotoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.math.BigInteger;
+import java.util.Date;
+
+
+@Api(value = "补图片", tags = "补图片相关")
+@RestController
+@Slf4j
+public class UpPhotoController extends BaseController {
+
+    @Autowired
+    TerminalPhotoService terminalPhotoService;
+
+    @PostMapping("upload")
+    @ApiOperation("处理icd文件")
+    public ResponseReult<String> upload(@RequestParam("file") MultipartFile file,
+                                        @RequestParam(value = "termid",required = false) Integer termid,
+                                        @RequestParam(value = "cmdid",required = false) String cmdid,
+                                        @RequestParam(value = "channel",required = false) Integer channel,
+                                        @RequestParam(value = "phototime",required = false) BigInteger phototime) throws Exception {
+        //保存在服务器中
+        ServiceBody<String> serviceBody = terminalPhotoService.uploadPhoto(file, termid, cmdid, channel, phototime);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UpgradeController.java

@@ -0,0 +1,73 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.MntnUpgrades;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_service.service.UpgradeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@Api(tags = {"升级相关接口"})
+@RequestMapping("upgrade")
+@Slf4j
+public class UpgradeController extends BaseController {
+
+    @Resource
+    UpgradeService service;
+
+    @GetMapping("listAll")
+    @ApiOperation("查询全部列表")
+    public ResponseReult<List<MntnUpgrades>> listAll(Integer type) {
+        List<MntnUpgrades> result = service.listAll(type);
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("upload")
+    @ApiOperation("上传")
+    public ResponseReult<String> upload(@RequestParam("file") MultipartFile file,
+                                        @RequestParam(value = "title", required = false) String title,
+                                        @RequestParam(value = "type", required = true) Integer type) throws Exception {
+        if (file == null) {
+            throw new ApiException("缺少上传的文件");
+        }
+        if (StringUtils.isBlank(file.getOriginalFilename())) {
+            throw new ApiException("文件格式不正确");
+        }
+        MntnUpgrades record = new MntnUpgrades();
+        record.setTitle(title);
+        record.setType(type);
+        service.upload(record, file);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("updateTitle")
+    @ApiOperation("修改")
+    public ResponseReult<String> updateTitle(@Validated @RequestBody MntnUpgrades item) throws Exception {
+        if (item.getId() == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.updateTitle(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("delete")
+    @ApiOperation("删除")
+    public ResponseReult<String> delete(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        if (id == null) {
+            throw new ApiException("id不能为空!");
+        }
+        service.delete(id);
+        return ResponseReult.success("OK");
+    }
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java

@@ -5,10 +5,11 @@ import com.shxy.xymanager_common.base.BaseController;
 import com.shxy.xymanager_common.base.ResponseReult;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.bean.ServiceStatus;
-import com.shxy.xymanager_common.model.TerminalApkInfoListModel;
+import com.shxy.xymanager_common.entity.TerminalUpload;
+import com.shxy.xymanager_common.page.TableDataInfo;
 import com.shxy.xymanager_common.vo.PageVo;
 import com.shxy.xymanager_common.vo.TerminalApkVo;
-import com.shxy.xymanager_common.vo.TerminalUploadVo;
+import com.shxy.xymanager_common.vo.TerminalUpdateApkVo;
 import com.shxy.xymanager_service.service.UploadService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,11 +17,7 @@ import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-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.*;
 import org.springframework.web.multipart.MultipartFile;
 
 
@@ -34,10 +31,11 @@ public class UploadController extends BaseController {
 
     @ApiOperation(value = "上传APK", notes = "上传APK接口", httpMethod = "POST")
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
-    @RequestMapping("/uploadApk")
+    @PostMapping("/uploadApk")
     @Log(title = "上传APK", type = "新增")
-    public ResponseReult<String> issueApk(@RequestParam("file")MultipartFile file,@RequestParam("version")String version) {
-        ServiceBody<String> serviceBody = uploadService.upload(file,version);
+    public ResponseReult<String> uploadApk(@RequestParam("file") MultipartFile file, @RequestParam("title") String title
+            , @RequestParam("name") String name) {
+        ServiceBody<String> serviceBody = uploadService.upload(file, title, name);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {
@@ -49,8 +47,35 @@ public class UploadController extends BaseController {
     @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
     @RequestMapping("/listApk")
     @Log(title = "查询APK列表", type = "查询")
-    public ResponseReult<TerminalApkInfoListModel> listApk(@RequestBody PageVo vo) {
-        ServiceBody<TerminalApkInfoListModel> serviceBody = uploadService.listApk(vo);
+    public ResponseReult<TableDataInfo<TerminalUpload>> listApk(@RequestBody PageVo vo) {
+        ServiceBody<TableDataInfo<TerminalUpload>> serviceBody = uploadService.listApk(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+    @ApiOperation(value = "修改apk列表", notes = "修改apk列表", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/updateApk")
+    @Log(title = "修改apk列表", type = "修改")
+    public ResponseReult<String> updateApk(@RequestBody TerminalUpdateApkVo vo) {
+        ServiceBody<String> serviceBody = uploadService.updateApk(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
+
+    @ApiOperation(value = "删除apk列表", notes = "修改apk列表", httpMethod = "POST")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/deleteApk")
+    @Log(title = "删除apk列表", type = "修改")
+    public ResponseReult<String> deleteApk(@RequestBody TerminalUpdateApkVo vo) {
+        ServiceBody<String> serviceBody = uploadService.deleteApk(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UserController.java

@@ -0,0 +1,82 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.bean.PermissionDetail;
+import com.shxy.xymanager_common.bean.ServiceStatus;
+import com.shxy.xymanager_common.entity.DyLevel;
+import com.shxy.xymanager_common.entity.SysUser;
+import com.shxy.xymanager_common.entity.TbPermission;
+import com.shxy.xymanager_common.model.PermissionModel;
+import com.shxy.xymanager_common.threadlocal.UserContextHolder;
+import com.shxy.xymanager_service.service.NewCacheService;
+import com.shxy.xymanager_service.service.PermissionService;
+import com.shxy.xymanager_service.service.UserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@RestController
+@Api(tags = {"用户权限相关接口"})
+@RequestMapping("user")
+@Slf4j
+public class UserController extends BaseController {
+
+    @Resource
+    UserService service;
+    @Resource
+    PermissionService permissionService;
+    @Resource
+    NewCacheService cacheService;
+
+
+    @GetMapping("getFullTree")
+    @ApiOperation("查询数据全量树")
+    public ResponseReult<List<DyLevel>> getFullTree() {
+        List<DyLevel> list = cacheService.getFullTree();
+        return ResponseReult.success(list);
+    }
+
+    @GetMapping("getPermission")
+    @ApiOperation("查询权限")
+    public ResponseReult<List<TbPermission>> getPermission(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        List<TbPermission> result = permissionService.getPermission(id);
+        return ResponseReult.success(result);
+    }
+
+    @PostMapping("changePermission")
+    @ApiOperation("修改权限")
+    public ResponseReult<String> changePermission(@Validated @RequestBody PermissionModel item) throws Exception {
+        permissionService.changePermission(item.getUserId(), item.getList());
+        return ResponseReult.success("OK");
+    }
+
+    /**
+     * @param
+     * @return ResponseReult
+     * @Description 获取当前用户
+     */
+    @ApiOperation(value = "获取当前用户", notes = "获取当前用户", httpMethod = "GET")
+    @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
+    @RequestMapping("/currentUser")
+    public ResponseReult<SysUser> currentUser() throws Exception {
+        SysUser user = UserContextHolder.currentUserInfo();
+        if (user != null) {
+            user.setPassword("");
+            PermissionDetail permission = cacheService.getPermissionDetailFull(user.getUid());
+            user.setPermission(permission);
+            return ResponseReult.success(user);
+        } else {
+            return ResponseReult.error(ServiceStatus.ERROR, "未获取到当前用户信息");
+        }
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/WeatherController.java

@@ -0,0 +1,110 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.Weathers;
+import com.shxy.xymanager_common.model.StatWeather;
+import com.shxy.xymanager_common.util.EasyExcelUtil;
+import com.shxy.xymanager_service.service.WeatherService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@Api(tags = {"气象相关接口"})
+@RequestMapping("weather")
+@Slf4j
+public class WeatherController extends BaseController {
+
+    @Resource
+    WeatherService service;
+
+    @GetMapping("list")
+    @ApiOperation("查询列表")
+    @Log(title = "查询气象列表", type = "查询")
+    public ResponseReult<PageInfo<Weathers>> list(Integer lineId, Integer towerId, Integer termId,
+                                                  Long start, Long end,
+                                                  Integer pageNum, Integer pageSize) {
+        List<Integer> idList = null;
+        if (termId != null) {
+            idList = new ArrayList<>();
+            idList.add(termId);
+        }
+        PageInfo<Weathers> result = service.list(lineId, towerId, idList,
+                start, end, pageNum, pageSize);
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("listStat")
+    @ApiOperation("查询统计")
+    @Log(title = "查询气象统计", type = "查询")
+    public ResponseReult<List<StatWeather>> listStat(Integer lineId, Integer towerId, Integer termId,
+                                                     Long start, Long end,
+                                                     Integer pageNum, Integer pageSize) {
+        List<Integer> idList = null;
+        if (termId != null) {
+            idList = new ArrayList<>();
+            idList.add(termId);
+        }
+        pageNum = 1;
+        pageSize = 100000;
+        PageInfo<Weathers> result = service.list(lineId, towerId, idList,
+                start, end, pageNum, pageSize);
+        List<StatWeather> list = this.buildStat(result.getList());
+        return ResponseReult.success(list);
+    }
+
+    private List<StatWeather> buildStat(List<Weathers> list) {
+        List<StatWeather> result = new ArrayList<>();
+        if (list != null) {
+            for (Weathers item : list) {
+                StatWeather term = this.findStatTerm(result, item);
+                term.addWeather(item);
+            }
+        }
+        return result;
+    }
+
+    private StatWeather findStatTerm(List<StatWeather> list, Weathers weathers) {
+        StatWeather the = null;
+        for (StatWeather item : list) {
+            if (item.getTermId() == weathers.getTermId()) {
+                the = item;
+                break;
+            }
+        }
+        if (the == null) {
+            the = new StatWeather();
+            the.setTermId(weathers.getTermId());
+            the.setCmdid(weathers.getCmdid());
+            list.add(the);
+        }
+        return the;
+    }
+
+    @GetMapping("export")
+    @ApiOperation("导出")
+    @Log(title = "导出气象", type = "导出")
+    public void export(Integer lineId, Integer towerId, Integer termId,
+                       Long start, Long end,
+                       Integer pageNum, Integer pageSize,
+                       HttpServletResponse response) throws Exception {
+        List<Integer> idList = null;
+        if (termId != null) {
+            idList = new ArrayList<>();
+            idList.add(termId);
+        }
+        PageInfo<Weathers> result = service.list(lineId, towerId, idList,
+                start, end, pageNum, pageSize);
+        EasyExcelUtil.createExcel(response, "覆冰数据", result.getList(), Weathers.class);
+    }
+
+}

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/ZhipingController.java

@@ -0,0 +1,318 @@
+package com.shxy.xymanager_admin.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.shxy.xymanager_common.annotation.Log;
+import com.shxy.xymanager_common.base.BaseController;
+import com.shxy.xymanager_common.base.ResponseReult;
+import com.shxy.xymanager_common.entity.*;
+import com.shxy.xymanager_common.exception.ApiException;
+import com.shxy.xymanager_common.util.*;
+import com.shxy.xymanager_common.zhiping.*;
+import com.shxy.xymanager_service.service.HenanService;
+import com.shxy.xymanager_service.service.LeadPullsService;
+import com.shxy.xymanager_service.service.WeatherService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@Api(tags = {"微气象监测数据同步接口"})
+@RequestMapping("henan")
+@Slf4j
+public class ZhipingController extends BaseController {
+
+    String accountName = "admin";
+    String secretKey = "SHxy@2024";
+    @Resource
+    LeadPullsService leadPullsService;
+    @Resource
+    WeatherService weatherService;
+    @Autowired
+    TokenUtil tokenUtil;
+    @Resource
+    HenanService henanService;
+
+    @PostMapping("addWeather")
+    @ApiOperation("新增天气装置")
+    public ResponseReult<String> addWeather(@RequestBody TerminalWeather item) throws Exception {
+        henanService.addWeather(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("addPoint")
+    @ApiOperation("新增拉力装置")
+    public ResponseReult<String> addPoint(@RequestBody TerminalPoint item) throws Exception {
+        henanService.addPoint(item);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("delWeather")
+    @ApiOperation("删除天气装置")
+    public ResponseReult<String> delWeather(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        if (id == null) {
+            throw new ApiException("id不能为空!");
+        }
+        henanService.delWeather(id);
+        return ResponseReult.success("OK");
+    }
+
+    @PostMapping("delPoint")
+    @ApiOperation("删除拉力装置")
+    public ResponseReult<String> delPoint(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception {
+        if (id == null) {
+            throw new ApiException("id不能为空!");
+        }
+        henanService.delPoint(id);
+        return ResponseReult.success("OK");
+    }
+
+    @GetMapping("getWeatherList")
+    @ApiOperation("查询天气装置列表")
+    public ResponseReult<List<TerminalWeather>> getWeatherList() {
+        List<TerminalWeather> result = henanService.getWeatherList();
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("getPointList")
+    @ApiOperation("查询拉力装置点表")
+    public ResponseReult<List<TerminalPoint>> getPointList() {
+        List<TerminalPoint> result = henanService.getPointList();
+        return ResponseReult.success(result);
+    }
+
+    @GetMapping("query")
+    @ApiOperation("查询")
+    @Log(title = "微气象监测数据同步查询", type = "查询")
+    public ZhipingReult<List<OutModel>> query(String actiontype, String timestamp,
+                                              String beginTime, String endTime) throws Exception {
+        ZhipingReult result = new ZhipingReult();
+        result.setCode("0");
+
+        if (StringUtils.isBlank(beginTime)) {
+            result.setCode("400");
+            result.setMsg("beginTime不能为空");
+        } else if (StringUtils.isBlank(endTime)) {
+            result.setCode("400");
+            result.setMsg("endTime不能为空");
+        } else if (StringUtils.isBlank(timestamp)) {
+            result.setCode("400");
+            result.setMsg("timestamp不能为空");
+        } else if (!timestamp.contains("9186B579774441C58FB0867FF05C8CE2")) {
+            result.setCode("400");
+            result.setMsg("私钥不正确");
+        } else {
+            Date start = DateUtil.parse(beginTime);
+            Date end = DateUtil.parse(endTime);
+            if ("meteo".equals(actiontype)) {
+                PageInfo<Weathers> page = weatherService.list(null, null, null,
+                        start.getTime() / 1000, end.getTime() / 1000, 1, 10000);
+                if (!CollectionUtils.isEmpty(page.getList())) {
+                    List<OutModel> list = new ArrayList<>();
+                    for (Weathers weather : page.getList()) {
+                        OutModel item = new OutModel();
+                        item.setCmonitorCode(weather.getCmdid());
+                        item.setCupdateTime(DateUtil.format(weather.getUpdateDate()));
+                        item.setCtemperature(String.valueOf(weather.getAirTemperature()));
+                        item.setChumidity(String.valueOf(weather.getHumidity()));
+                        item.setCwindSpeed(String.valueOf(weather.getStandardWindSpeed()));
+                        item.setCwindDirection(String.valueOf(weather.getAvgWindDir10min()));
+                        item.setCsunshine(String.valueOf(weather.getRadiationIntensity()));
+                        item.setCrainAmount(String.valueOf(weather.getPrecipitation()));
+                        list.add(item);
+                    }
+                    result.setDataCount(String.valueOf(list.size()));
+                    result.setDataList(list);
+                }
+            } else if ("ice_weight".equals(actiontype)) {
+                PageInfo<LeadPulls> page = leadPullsService.list(null, null, null,
+                        start.getTime() / 1000, end.getTime() / 1000, 1, 10000);
+                if (!CollectionUtils.isEmpty(page.getList())) {
+                    List<OutModel> list = new ArrayList<>();
+                    for (LeadPulls pull : page.getList()) {
+                        OutModel item = new OutModel();
+                        item.setCmonitorCode(pull.getCmdid());
+                        item.setCupdateTime(DateUtil.format(pull.getUpdateDate()));
+                        item.setCwindAngle(String.valueOf(pull.getWindSpeed()));
+                        item.setCice(String.valueOf(0));
+                        Float x = (pull.getMaxpullPull() + pull.getMinpullPull()) / 2;
+                        item.setCpull(String.valueOf(pull.getMaxpullPull()));
+                        item.setCpullAngle(String.valueOf(x));
+                        list.add(item);
+                    }
+                    result.setDataCount(String.valueOf(list.size()));
+                    result.setDataList(list);
+                }
+            } else {
+                result.setCode("400");
+                result.setMsg("actiontype不正确");
+            }
+        }
+
+        result.setRTime(DateUtil.format(new Date()));
+        return result;
+    }
+
+    @PostMapping("login")
+    @ApiOperation("同步登入")
+    @Log(title = "同步登入", type = "登入")
+    public SdqjResult login(@RequestBody LoginModel model) throws Exception {
+        SdqjResult result = new SdqjResult();
+        String account = DigestUtils.md5(accountName);
+        String key = DigestUtils.md5(secretKey);
+        if (account.equals(model.getAccountName()) &&
+                key.equals(model.getSecretKey())) {
+            result.setCode("200");
+            result.setMessage("认证成功");
+            Long time = System.currentTimeMillis() / 1000;
+            String token = tokenUtil.generateToken(time.intValue());
+            result.setToken(token);
+        } else {
+            result.setCode("-1");
+            result.setMessage("认证失败");
+        }
+        return result;
+    }
+
+    @PostMapping("queryMicromes")
+    @ApiOperation("天气数据同步查询")
+    @Log(title = "天气数据同步查询", type = "查询")
+    public SdqjResult queryMicromes(String token,
+                                    String startTime, String endTime) throws Exception {
+
+        if (StringUtils.isBlank(token)) {
+            return SdqjResult.error("token不能为空");
+        }
+        if (StringUtils.isBlank(startTime)) {
+            return SdqjResult.error("startTime不能为空");
+        }
+        if (StringUtils.isBlank(endTime)) {
+            return SdqjResult.error("endTime不能为空");
+        }
+        try {
+            String str = tokenUtil.getUserId(token);
+            long time = Long.valueOf(str);
+            time = System.currentTimeMillis() / 1000 - time;
+            if (time >= 0 && time <= 30 * 60) {
+
+            } else {
+                return SdqjResult.error("token已过期");
+            }
+        } catch (Exception e) {
+            return SdqjResult.error("token无效");
+        }
+
+        Date start = DateUtil.parse(startTime);
+        Date end = DateUtil.parse(endTime);
+        List<WeatherModel> result = new ArrayList<>();
+        List<Weathers> list = henanService.queryMicromes(start, end);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (Weathers weather : list) {
+                WeatherModel item = new WeatherModel();
+                item.setCollTime(DateUtil.format(weather.getUpdateDate()));
+                item.setWindAvg(String.valueOf(weather.getAvgWindSpeed10min()));
+                item.setWindAngle(String.valueOf(weather.getAvgWindDir10min()));
+                item.setMaxWind(String.valueOf(weather.getMaxWindSpeed()));
+                if (weather.getExtremeWindSpeed() == null) {
+                    item.setExtrWind("0");
+                } else {
+                    item.setExtrWind(String.valueOf(weather.getExtremeWindSpeed()));
+                }
+                item.setStandWind(String.valueOf(weather.getStandardWindSpeed()));
+                item.setTemperature(String.valueOf(weather.getAirTemperature()));
+                item.setHumidity(String.valueOf(weather.getHumidity()));
+                item.setPressure(String.valueOf(weather.getAirPressure()));
+                item.setPrecipitation(String.valueOf(weather.getPrecipitation()));
+                if (weather.getPrecipitationIntensity() == null) {
+                    item.setPrecipInten("0");
+                } else {
+                    item.setPrecipInten(String.valueOf(weather.getPrecipitationIntensity()));
+                }
+                item.setRadiaInten(String.valueOf(weather.getRadiationIntensity()));
+                item.setIce("0");
+                item.setPull("0");
+                item.setTiltAngle("0");
+                item.setEquipId(weather.getCmdid());
+                result.add(item);
+            }
+        } else {
+            String str = "从" + startTime + "到" + endTime + "无天气数据";
+            String key = "weather";
+            if (!PulliceModel.fubinDoneMap.containsKey(key)) {
+                PulliceModel.fubinDoneMap.put(key, "");
+                DingTalkPushUtil.alertFB1.add(str);
+            }
+        }
+        return SdqjResult.success(result);
+    }
+
+    @PostMapping("queryPullIces")
+    @ApiOperation("覆冰拉力数据同步查询")
+    @Log(title = "覆冰拉力数据同步查询", type = "查询")
+    public SdqjResult queryPullIces(String token,
+                                    String startTime, String endTime) throws Exception {
+
+        if (StringUtils.isBlank(token)) {
+            return SdqjResult.error("token不能为空");
+        }
+        if (StringUtils.isBlank(startTime)) {
+            return SdqjResult.error("startTime不能为空");
+        }
+        if (StringUtils.isBlank(endTime)) {
+            return SdqjResult.error("endTime不能为空");
+        }
+        try {
+            String str = tokenUtil.getUserId(token);
+            long time = Long.valueOf(str);
+            time = System.currentTimeMillis() / 1000 - time;
+            if (time >= 0 && time <= 30 * 60) {
+
+            } else {
+                return SdqjResult.error("token已过期");
+            }
+        } catch (Exception e) {
+            return SdqjResult.error("token无效");
+        }
+
+        Date start = DateUtil.parse(startTime);
+        Date end = DateUtil.parse(endTime);
+        List<PulliceModel> result = new ArrayList<>();
+        List<LeadPulls> list = henanService.queryPullIces(start, end);
+        if (!CollectionUtils.isEmpty(list)) {
+            for (LeadPulls pull : list) {
+                PulliceModel item = new PulliceModel();
+                item.setCollTime(DateUtil.format(pull.getUpdateDate()));
+                item.setPull(String.valueOf(pull.getMaxpullPull()));
+                item.setCrosswiseAngle(String.valueOf(pull.getMaxpullWind()));
+                item.setForwardTiltAngle(String.valueOf(pull.getMaxpullTilt()));
+                item.setAirTemper("0");
+                item.setHumidity("0");
+                item.setWindSpeed("0");
+                item.setWAngle("0");
+                item.setCcll(String.valueOf(pull.getCcll()));
+                item.setEquipId(pull.getCmdid());
+                item.setPointId(pull.getCmdid() + "_" + pull.getPhase());
+                item.setT_Sensor_Num(String.valueOf(pull.getCount()));
+                item.calculate();
+                result.add(item);
+            }
+        } else {
+            String str = "从" + startTime + "到" + endTime + "无覆冰拉力数据";
+            String key = "pull";
+            if (!PulliceModel.fubinDoneMap.containsKey(key)) {
+                PulliceModel.fubinDoneMap.put(key, "");
+                DingTalkPushUtil.alertFB1.add(str);
+            }
+        }
+        return SdqjResult.success(result);
+    }
+}

xymanager_admin/src/main/resources/application-dev.yml

@@ -1,183 +0,0 @@
-## Spring配置
-#spring:
-#    # 数据源配置
-#    datasource:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driverClassName: com.mysql.cj.jdbc.Driver
-#        druid:
-#            # 主库数据源
-#            master:
-#                url: jdbc:mysql://139.196.98.172:3306/fc_medicialkit?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: Root*123
-#            # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: false
-#                url:
-#                username:
-#                password:
-#            # 初始连接数
-#            initialSize: 5
-#            # 最小连接池数量
-#            minIdle: 10
-#            # 最大连接池数量
-#            maxActive: 20
-#            # 配置获取连接等待超时的时间
-#            maxWait: 60000
-#            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#            timeBetweenEvictionRunsMillis: 60000
-#            # 配置一个连接在池中最小生存的时间，单位是毫秒
-#            minEvictableIdleTimeMillis: 300000
-#            # 配置一个连接在池中最大生存的时间，单位是毫秒
-#            maxEvictableIdleTimeMillis: 900000
-#            # 配置检测连接是否有效
-#            validationQuery: SELECT 1 FROM DUAL
-#            testWhileIdle: true
-#            testOnBorrow: false
-#            testOnReturn: false
-#            webStatFilter:
-#                enabled: true
-#            statViewServlet:
-#                enabled: true
-#                # 设置白名单，不填则允许所有访问
-#                allow:
-#                url-pattern: /druid/*
-#                # 控制台管理用户名和密码
-#                login-username: root
-#                login-password: 123456
-#            filter:
-#                stat:
-#                    enabled: true
-#                    # 慢SQL记录
-#                    log-slow-sql: true
-#                    slow-sql-millis: 1000
-#                    merge-sql: true
-#                wall:
-#                    config:
-#                        multi-statement-allow: true
-##    # 资源信息
-##    messages:
-##        # 国际化资源文件路径
-##        basename: i18n/messages
-##    # 文件上传
-##    servlet:
-##        multipart:
-##            # 单个文件大小
-##            max-file-size:  20MB
-##            # 设置总上传的文件大小
-##            max-request-size:  20MB
-##    # 服务模块
-##    devtools:
-##        restart:
-##            # 热部署开关
-##            enabled: true
-#    # redis 配置
-##    redis:
-##        # 地址
-##        host: localhost
-##        # 端口，默认为6379
-##        port: 6379
-##        # 数据库索引
-##        database: 0
-##        # 密码
-##        password:
-##        # 连接超时时间
-##        timeout: 10s
-##        lettuce:
-##            pool:
-##                # 连接池中的最小空闲连接
-##                min-idle: 0
-##                # 连接池中的最大空闲连接
-##                max-idle: 8
-##                # 连接池的最大数据库连接数
-##                max-active: 8
-##                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-##                max-wait: -1ms
-#
-## 项目相关配置
-##shop-backend:
-##    # 名称
-##    name: 知青人电商后端管理系统
-##    # 版本
-##    version: 1.0.0
-##    # 版权年份
-##    copyrightYear: 2021
-##    # 实例演示开关
-##    demoEnabled: true
-##    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-##    profile: D:/shop-backend/uploadPath
-##    # 获取ip地址开关
-##    addressEnabled: false
-##    # 验证码类型 math 数组计算 char 字符验证
-##    captchaType: math
-#
-## 开发环境配置
-#server:
-#    # 服务器的HTTP端口，默认为8080
-#    port: 8087
-#    servlet:
-#        # 应用的访问路径
-#        context-path: /zqrssb
-#    tomcat:
-#        # tomcat的URI编码
-#        uri-encoding: UTF-8
-#        # 连接数满后的排队数，默认为100
-#        accept-count: 1000
-#        max-swallow-size: -1  # tomcat默认大小2M，超过2M的文件不会被捕获，需要调整此处大小为100MB或者-1即可
-#        threads:
-#            # tomcat最大线程数，默认为200
-#            max: 800
-#            # Tomcat启动初始化的线程数，默认值10
-#            min-spare: 100
-#
-### 日志配置
-##logging:
-##    config: classpath:log4j2ss.xml
-##    level:
-##        com.fc: debug
-##        org.springframework: warn
-#
-## token配置
-#token:
-#    # 令牌自定义标识
-#    header: Authorization
-#    # 令牌密钥
-#    secret: abcdefghijklmnopqrstuvwxyz
-#    # 令牌有效期（默认30分钟）
-#    expireTime: 30
-#
-## MyBatis配置
-#mybatis:
-#    # 搜索指定包别名
-#    type-aliases-package: com.fc.**.model
-#    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-#    mapper-locations: classpath*:mappers/**/*Dao.xml
-#    # 加载全局的配置文件
-#    configLocation: classpath:mybatis/mybatis-config.xml
-#
-##mybatis:
-##    mapper-locations: classpath:mappers/**/*.xml
-##    type-aliases-package: com.fuchang.entity
-#
-### PageHelper分页插件
-##pagehelper:
-##    helperDialect: mysql
-##    supportMethodsArguments: true
-##    params: count=countSql
-##
-## Swagger配置
-#swagger2:
-#    # 是否开启swagger
-#    enabled: true
-#    # 请求前缀
-##    pathMapping: /dev-api
-##
-### 防止XSS攻击
-##xss:
-##    # 过滤开关
-##    enabled: true
-##    # 排除链接（多个用逗号分隔）
-##    excludes: /system/notice
-##    # 匹配链接
-##    urlPatterns: /system/*,/monitor/*,/tool/*

xymanager_admin/src/main/resources/application-prod.yml

@@ -1,183 +0,0 @@
-## Spring配置
-#spring:
-#    # 数据源配置
-#    datasource:
-#        type: com.alibaba.druid.pool.DruidDataSource
-#        driverClassName: com.mysql.cj.jdbc.Driver
-#        druid:
-#            # 主库数据源
-#            master:
-#                url: jdbc:mysql://139.196.98.172:3306/fc_medicialkit?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#                username: root
-#                password: Root*123
-#            # 从库数据源
-#            slave:
-#                # 从数据源开关/默认关闭
-#                enabled: false
-#                url:
-#                username:
-#                password:
-#            # 初始连接数
-#            initialSize: 5
-#            # 最小连接池数量
-#            minIdle: 10
-#            # 最大连接池数量
-#            maxActive: 20
-#            # 配置获取连接等待超时的时间
-#            maxWait: 60000
-#            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#            timeBetweenEvictionRunsMillis: 60000
-#            # 配置一个连接在池中最小生存的时间，单位是毫秒
-#            minEvictableIdleTimeMillis: 300000
-#            # 配置一个连接在池中最大生存的时间，单位是毫秒
-#            maxEvictableIdleTimeMillis: 900000
-#            # 配置检测连接是否有效
-#            validationQuery: SELECT 1 FROM DUAL
-#            testWhileIdle: true
-#            testOnBorrow: false
-#            testOnReturn: false
-#            webStatFilter:
-#                enabled: true
-#            statViewServlet:
-#                enabled: true
-#                # 设置白名单，不填则允许所有访问
-#                allow:
-#                url-pattern: /druid/*
-#                # 控制台管理用户名和密码
-#                login-username: root
-#                login-password: 123456
-#            filter:
-#                stat:
-#                    enabled: true
-#                    # 慢SQL记录
-#                    log-slow-sql: true
-#                    slow-sql-millis: 1000
-#                    merge-sql: true
-#                wall:
-#                    config:
-#                        multi-statement-allow: true
-##    # 资源信息
-##    messages:
-##        # 国际化资源文件路径
-##        basename: i18n/messages
-##    # 文件上传
-##    servlet:
-##        multipart:
-##            # 单个文件大小
-##            max-file-size:  20MB
-##            # 设置总上传的文件大小
-##            max-request-size:  20MB
-##    # 服务模块
-##    devtools:
-##        restart:
-##            # 热部署开关
-##            enabled: true
-#    # redis 配置
-##    redis:
-##        # 地址
-##        host: localhost
-##        # 端口，默认为6379
-##        port: 6379
-##        # 数据库索引
-##        database: 0
-##        # 密码
-##        password:
-##        # 连接超时时间
-##        timeout: 10s
-##        lettuce:
-##            pool:
-##                # 连接池中的最小空闲连接
-##                min-idle: 0
-##                # 连接池中的最大空闲连接
-##                max-idle: 8
-##                # 连接池的最大数据库连接数
-##                max-active: 8
-##                # #连接池最大阻塞等待时间（使用负值表示没有限制）
-##                max-wait: -1ms
-#
-## 项目相关配置
-##shop-backend:
-##    # 名称
-##    name: 知青人电商后端管理系统
-##    # 版本
-##    version: 1.0.0
-##    # 版权年份
-##    copyrightYear: 2021
-##    # 实例演示开关
-##    demoEnabled: true
-##    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-##    profile: D:/shop-backend/uploadPath
-##    # 获取ip地址开关
-##    addressEnabled: false
-##    # 验证码类型 math 数组计算 char 字符验证
-##    captchaType: math
-#
-## 开发环境配置
-#server:
-#    # 服务器的HTTP端口，默认为8080
-#    port: 8087
-#    servlet:
-#        # 应用的访问路径
-#        context-path: /zqrssb
-#    tomcat:
-#        # tomcat的URI编码
-#        uri-encoding: UTF-8
-#        # 连接数满后的排队数，默认为100
-#        accept-count: 1000
-#        max-swallow-size: -1  # tomcat默认大小2M，超过2M的文件不会被捕获，需要调整此处大小为100MB或者-1即可
-#        threads:
-#            # tomcat最大线程数，默认为200
-#            max: 800
-#            # Tomcat启动初始化的线程数，默认值10
-#            min-spare: 100
-#
-### 日志配置
-##logging:
-##    config: classpath:log4j2ss.xml
-##    level:
-##        com.fc: debug
-##        org.springframework: warn
-#
-## token配置
-#token:
-#    # 令牌自定义标识
-#    header: Authorization
-#    # 令牌密钥
-#    secret: abcdefghijklmnopqrstuvwxyz
-#    # 令牌有效期（默认30分钟）
-#    expireTime: 30
-#
-## MyBatis配置
-#mybatis:
-#    # 搜索指定包别名
-#    type-aliases-package: com.fc.**.model
-#    # 配置mapper的扫描，找到所有的mapper.xml映射文件
-#    mapper-locations: classpath*:mappers/**/*Dao.xml
-#    # 加载全局的配置文件
-#    configLocation: classpath:mybatis/mybatis-config.xml
-#
-##mybatis:
-##    mapper-locations: classpath:mappers/**/*.xml
-##    type-aliases-package: com.fuchang.entity
-#
-### PageHelper分页插件
-##pagehelper:
-##    helperDialect: mysql
-##    supportMethodsArguments: true
-##    params: count=countSql
-##
-## Swagger配置
-#swagger2:
-#    # 是否开启swagger
-#    enabled: true
-#    # 请求前缀
-##    pathMapping: /dev-api
-##
-### 防止XSS攻击
-##xss:
-##    # 过滤开关
-##    enabled: true
-##    # 排除链接（多个用逗号分隔）
-##    excludes: /system/notice
-##    # 匹配链接
-##    urlPatterns: /system/*,/monitor/*,/tool/*

xymanager_admin/src/main/resources/application-test.yml

@@ -1,102 +1,31 @@
 # Spring配置
 spring:
+  cache:
+    type: simple
+  redis:
+    host: 192.168.1.190
+    port: 6379
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/xymp?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.1.190:3306/xymp_chenxi?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: 123456
     type: com.alibaba.druid.pool.DruidDataSource
   servlet:
     multipart:
       # 指定自定义上传目录
-      location: http://47.96.238.157/usr/local/home/manager/temp/
-#spring:
-#  # 数据源配置
-#  datasource:
-#    type: com.alibaba.druid.pool.DruidDataSource
-#    driverClassName: com.mysql.cj.jdbc.Driver
-#    druid:
-#      # 主库数据源
-#      master:
-#        url: jdbc:mysql://192.168.200.63:3306/xymp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: xymp
-#        password: xymp@123
-#      # 从库数据源
-#      slave:
-#        # 从数据源开关/默认关闭
-#        enabled: false
-#        url:
-#        username:
-#        password:
-#      # 初始连接数
-#      initialSize: 5
-#      # 最小连接池数量
-#      minIdle: 10
-#      # 最大连接池数量
-#      maxActive: 20
-#      # 配置获取连接等待超时的时间
-#      maxWait: 60000
-#      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-#      timeBetweenEvictionRunsMillis: 60000
-#      # 配置一个连接在池中最小生存的时间，单位是毫秒
-#      minEvictableIdleTimeMillis: 300000
-#      # 配置一个连接在池中最大生存的时间，单位是毫秒
-#      maxEvictableIdleTimeMillis: 900000
-#      # 配置检测连接是否有效
-#      validationQuery: SELECT 1 FROM DUAL
-#      testWhileIdle: true
-#      testOnBorrow: false
-#      testOnReturn: false
-#      webStatFilter:
-#        enabled: true
-#      statViewServlet:
-#        enabled: true
-#        # 设置白名单，不填则允许所有访问
-#        allow:
-#        url-pattern: /druid/*
-#        # 控制台管理用户名和密码
-#        login-username: root
-#        login-password: 123456
-#      filter:
-#        stat:
-#          enabled: true
-#          # 慢SQL记录
-#          log-slow-sql: true
-#          slow-sql-millis: 1000
-#          merge-sql: true
-#        wall:
-#          config:
-#            multi-statement-allow: true
-#  #    # 资源信息
-#  #    messages:
-#  #        # 国际化资源文件路径
-#  #        basename: i18n/messages
-#  #    # 文件上传
-#  #    servlet:
-#  #        multipart:
-#  #            # 单个文件大小
-#  #            max-file-size:  20MB
-#  #            # 设置总上传的文件大小
-#  #            max-request-size:  20MB
-#  #    # 服务模块
-#  #    devtools:
-#  #        restart:
-#  #            # 热部署开关
-#  #            enabled: true
-#  mvc:
-#    view:
-#      suffix: .html
-#  # redis 配置
-#  servlet:
-#    multipart:
-#      max-file-size: 10MB  #单个数据大小
-#      max-request-size: 50MB #总数据大小
+      location: /usr/local/home/manager/temp/
+      max-request-size: 2000MB
+      max-file-size: 2000MB
 # MyBatis配置
 mybatis:
   # 搜索指定包别名
   type-aliases-package: com.shxy.**.model
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
-  mapper-locations: classpath*:mappers/**/*Dao.xml
+  mapper-locations: classpath*:mappers/**/*.xml
   # 加载全局的配置文件
   configLocation: classpath:mybatis/mybatis-config.xml
 # 项目相关配置
@@ -122,7 +51,7 @@ server:
   port: 8093
   servlet:
     # 应用的访问路径
-    context-path: /api
+    context-path: /xymanager
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -139,7 +68,7 @@ server:
 logging:
   config: classpath:log4j2.xml
   level:
-    com.shxy: trace
+    com.shxy: info
     org.springframework: warn
 
 
@@ -152,7 +81,6 @@ token:
   # 令牌有效期（默认30分钟）
   expireTime: 1
 
-
 # Swagger配置
 swagger2:
   # 是否开启swagger
@@ -168,6 +96,12 @@ swagger2:
 #    excludes: /system/notice
 #    # 匹配链接
 #    urlPatterns: /system/*,/monitor/*,/tool/*
+#运维配置
+maintain:
+  termlog: /home/xymp/termLogs/
+  apk: /home/xymp/apk/
+  uri: http://61.169.135.146:40085/
+  check: false
 
 cma:
   server: 127.0.0.1
@@ -175,8 +109,8 @@ cma:
   clientid: 10
   scheduletype: 202
 upload:
-  # path: file:/usr/local/home/manager/download/
-  path: http://47.96.238.157/usr/local/home/manager/download/
+   path: file:/usr/local/home/manager/download/
+#  path: http://47.96.238.157/usr/local/home/manager/download/
 photo:
   address: /photos/
 video:
@@ -192,3 +126,12 @@ rsa:
   public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCViq0L+1XCTKOkt9nmy9aQbMRNNJNBOtPYRlCq/bRuwlYaq/I+XqSDkIF8s4JJSy3/Vgjw0fp8d4O+5KBS4Om9Ela60I2Vv/q8LjCNFNYbRE6xI7yrlyPukodmC/s1VgODDRHn3vVyKcK9nyF7xZsXixnlvltAky888CJkLpiGjQIDAQAB
   private_key: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJWKrQv7VcJMo6S32ebL1pBsxE00k0E609hGUKr9tG7CVhqr8j5epIOQgXyzgklLLf9WCPDR+nx3g77koFLg6b0SVrrQjZW/+rwuMI0U1htETrEjvKuXI+6Sh2YL+zVWA4MNEefe9XIpwr2fIXvFmxeLGeW+W0CTLzzwImQumIaNAgMBAAECgYAzOn2LlD9Nv5lzzTPNl9jaQxiAZllnyDJYbcYmvaD5LIP4wRzMdvmexHtHb+tbFnEcfqmzbguEZiDw3Tt7COepQWvNzlM+/HbFtkXzSh6WEu2TgjZwudcCDHDyjDzUNgcWnBIw8/+Sy4COOm4p+UnprYK4sdriMZyz8K5UC8CxFQJBAODTt0lg/HiZKaOX7PMmsiRisd5oAslyDHCt66oPG29KTE1j4fwKDzGJlrOo1f4Q078IDYMO1I/Y3uP8Es3FT1MCQQCqRrD+lO3YCZOUGTHm2WGmbljIoeDpnIn2TZFyqDGKXs6EAx7SXkgarY2OC5O2aifMhXElPUGChfSgPmRUFHafAkEAxFtkWuwf1NxAJ6cKxZpoP6sLGenRdUrsXoUnrBEhruM/HOA9gLjwaB14x1SQASOFK/TGiE4ti6ynjoqbiafoDQJBAI0l6FZAsiBhX9pmQD1yeUXzNtmphr1gK+TmS+lVjyt6h4pa49PSn8atkyfqZNnTiYY6H56U9pbx3+Rtk9E23VUCQEZ9/JHUaGc77s3ibpcKFVemlb0i/Uvj2V45aoNfY34iex4biAUsRq/FJNiqBk+xQWkJ4QY8nKVE45GlaCfZ8/c=
 
+mqtt:
+  enable: false
+  clientId: code_client
+  broker: tcp://61.169.135.146:51001
+  username: xymp
+  password: xymp
+  photodir: /home/xymp/photos/
+
+camera-schedule: false

xymanager_admin/src/main/resources/log4j2.xml

@@ -30,7 +30,7 @@
             <!--输出日志的格式-->
             <PatternLayout pattern="${LOG_PATTERN}" disableAnsi="false" noConsoleNoAnsi="false"/>
             <!--控制台只输出level及其以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
-            <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
         </console>
 
         <!--
@@ -40,7 +40,7 @@
         <RollingFile name="RollingFileInfo" fileName="${FILE_PATH}/${FILE_NAME}-info.log"
                      filePattern="${FILE_PATH}/${FILE_NAME}-INFO-%d{yyyy-MM-dd}.log">
             <!--控制台只输出level及以上级别的信息（onMatch），其他的直接拒绝（onMismatch）-->
-            <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="${LOG_PATTERN}"/>
             <Policies>
                 <!--interval属性用来指定多久滚动一次，默认是1 hour-->

xymanager_admin/src/test/java/com/shxy/xymanager_admin/XymanagerAdminApplicationTests.java

@@ -1,25 +1,33 @@
 package com.shxy.xymanager_admin;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.shxy.xymanager_common.bean.PermissionDetail;
+import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.config.CustomRsaProperties;
 import com.shxy.xymanager_common.dto.*;
-import com.shxy.xymanager_common.entity.Lines;
-import com.shxy.xymanager_common.entity.RequestResults;
-import com.shxy.xymanager_common.entity.TerminalImgAlarmParams;
-import com.shxy.xymanager_common.entity.Terminals;
+import com.shxy.xymanager_common.entity.*;
 import com.shxy.xymanager_common.enums.CommonStatus;
+import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.util.*;
+import com.shxy.xymanager_common.vo.UpdateTowerVo;
 import com.shxy.xymanager_dao.dao.*;
 import com.shxy.xymanager_service.service.CacheService;
+import com.shxy.xymanager_service.service.NewCacheService;
+import com.shxy.xymanager_service.service.TowerService;
+import com.shxy.xymanager_service.service.UserService;
+import io.swagger.models.auth.In;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.math.BigInteger;
+import java.sql.Array;
 import java.sql.Time;
 import java.util.ArrayList;
 import java.util.Date;
@@ -29,33 +37,43 @@ import java.util.List;
 @SpringBootTest
 class XymanagerAdminApplicationTests {
 
-    @Autowired
-    TerminalsDao terminalsDao;
-    @Autowired
-    ScheduleDetailsDao scheduleDetailsDao;
-    @Autowired
-    SchedulesDao schedulesDao;
-    @Autowired
-    LinesDao linesDao;
-    @Autowired
-    private DyLevelDao dyLevelDao;
-
-    @Autowired
-    private TerminalPhotoDao terminalPhotoDao;
-
-    @Autowired
-    private TerminalSchedulesTempDao terminalSchedulesTempDao;
+//    @Autowired
+//    TerminalsDao terminalsDao;
+//    @Autowired
+//    ScheduleDetailsDao scheduleDetailsDao;
+//    @Autowired
+//    SchedulesDao schedulesDao;
+//    @Autowired
+//    LinesDao linesDao;
+//    @Autowired
+//    private DyLevelDao dyLevelDao;
+//
+//    @Autowired
+//    private TerminalPhotoDao terminalPhotoDao;
+//
+//    @Autowired
+//    private TerminalSchedulesTempDao terminalSchedulesTempDao;
+//
+//    @Autowired
+//    private TerminalScheduleDao terminalScheduleDao;
+//    @Autowired
+//    private RequestResultsDao requestResultsDao;
+//    @Autowired
+//    private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao;
+//
+//    @Autowired
+//    private CacheService cacheService;
+//@Autowired
+//View_Dy_Line_Tower_TerminalsDao view_dy_line_tower_terminalsDao;
 
     @Autowired
-    private TerminalScheduleDao terminalScheduleDao;
+    UserService userService;
     @Autowired
-    private RequestResultsDao requestResultsDao;
+    NewCacheService newCacheService;
     @Autowired
-    private TerminalImgAlarmParamsDao terminalImgAlarmParamsDao;
-
+    TowerDao towerDao;
     @Autowired
-    private CacheService cacheService;
-
+    TowerService towerService;
     @Test
     void contextLoads() {
 
@@ -313,12 +331,189 @@ class XymanagerAdminApplicationTests {
 //        Lines line = cacheService.getLine(108);
 //        System.out.println(line);
 
-        ArrayList<String> list = new ArrayList<>();
-        list.add("dfsaf");
-        list.add("ewrqer");
-        list.add("wfsakfd");
-        System.out.println(list.toArray());
+//        ArrayList<String> list = new ArrayList<>();
+//        list.add("dfsaf");
+//        list.add("ewrqer");
+//        list.add("wfsakfd");
+//        System.out.println(list.toArray());
+
+//        Date date = MyDateUtils.date(1689846097752l);
+//
+//        DateTime dateTime1 = MyDateUtils.offsetDay(date, -1);
+//        DateTime dateTime2 = MyDateUtils.offsetDay(date, -2);
+//        DateTime dateTime3 = MyDateUtils.offsetDay(date, -3);
+//        DateTime dateTime4 = MyDateUtils.offsetDay(date, -4);
+//        System.out.println(dateTime1.toString());
+
+
+//        ArrayList<String> strlist = new ArrayList<>();
+//        strlist.add("dsfad");
+//        strlist.add("dsaffad");
+//        strlist.add("dserefad");
+//        strlist.add("dsfa3432d");
+//        String[] array =new String[strlist.size()];
+//        strlist.toArray(array);
+//        System.out.println(array.toString());
+//        ArrayList<Integer> list = null;
+//        View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
+//        example.createCriteria().andDyIdIn(list);
+//        List<View_Dy_Line_Tower_Terminals> view_dy_line_tower_terminals = view_dy_line_tower_terminalsDao.selectByExample(example);
+//        System.out.println(view_dy_line_tower_terminals);
+
+//        View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
+//        example.setOrderByClause("d.id desc");
+//        View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
+//        if (BeanUtil.isNotEmpty(dyid)) {
+//            criteria.andDyIdEqualTo(dyid);
+//        }
+//        if (BeanUtil.isNotEmpty(lineid)) {
+//            criteria.andLineIdEqualTo(lineid);
+//        }
+//        if (BeanUtil.isNotEmpty(tower)) {
+//            criteria.andTowerIdEqualTo(tower);
+//        }
+//        View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or();
+//        or.andDyNameLike(search);
+//        View_Dy_Line_Tower_TerminalsExample.Criteria or1 = example.or();
+//        or1.andLineNameLike(search);
+//
+//        List<View_Dy_Line_Tower_Terminals> view_dy_line_tower_terminals = view_dy_line_tower_terminalsDao.selectByExample(example);
+//        System.out.println(view_dy_line_tower_terminals);
+
+
+//        View_Dy_Line_Tower_TerminalsExample example = new View_Dy_Line_Tower_TerminalsExample();
+//        example.setOrderByClause("id desc");
+//        View_Dy_Line_Tower_TerminalsExample.Criteria criteria = example.createCriteria();
+//        if (BeanUtil.isNotEmpty(dyid)) {
+//            criteria.andDyIdEqualTo(dyid);
+//        }
+//        if (BeanUtil.isNotEmpty(lineid)) {
+//            criteria.andLineIdEqualTo(lineid);
+//        }
+//        if (BeanUtil.isNotEmpty(tower)) {
+//            criteria.andTowerIdEqualTo(tower);
+//        }
+//        if (StrUtil.isNotEmpty(search)) {
+//            criteria.andDyNameLike(search);
+//        }
+//        View_Dy_Line_Tower_TerminalsExample.Criteria or = example.or();
+//        if (BeanUtil.isNotEmpty(dyid)) {
+//            or.andDyIdEqualTo(dyid);
+//        }
+//        if (BeanUtil.isNotEmpty(lineid)) {
+//            or.andLineIdEqualTo(lineid);
+//        }
+//        if (BeanUtil.isNotEmpty(tower)) {
+//            or.andTowerIdEqualTo(tower);
+//        }
+//        if (StrUtil.isNotEmpty(search)) {
+//            or.andLineNameLike(search);
+//        }
+//        View_Dy_Line_Tower_TerminalsExample.Criteria toweror = example.or();
+//        if (BeanUtil.isNotEmpty(dyid)) {
+//            toweror.andDyIdEqualTo(dyid);
+//        }
+//        if (BeanUtil.isNotEmpty(lineid)) {
+//            toweror.andLineIdEqualTo(lineid);
+//        }
+//        if (BeanUtil.isNotEmpty(tower)) {
+//            toweror.andTowerIdEqualTo(tower);
+//        }
+//        if (StrUtil.isNotEmpty(search)) {
+//            toweror.andTowerNameLike(search);
+//        }
+//
+//        List<View_Dy_Line_Tower_Terminals> view_dy_line_tower_terminals = view_dy_line_tower_terminalsDao.selectByExample(example);
+//        System.out.println(view_dy_line_tower_terminals);
+
+
+//        String[] array = new String[]{"XYIGQ10C231000009",
+//                "XYIGQ10C231000018",
+//                "XYIGQ10C231000039",
+//                "XYIGQ10C231000125",
+//                "XYIGQ10C231000132",
+//                "XYIGQ10C231000192",
+//                "XYIGQ10C231000202",
+//                "XYIGQ10C231000232",
+//                "XYIGQ10C231000240",
+//                "XYIGQ10C231000268",
+//                "XYIGQ10C231000284",
+//                "XYIGQ10C231000325",
+//                "XYIGQ10C231000357",
+//                "XYIGQ10C231000375",
+//                "XYIGQ10C231000427",
+//                "XYIGQ10C231000501",
+//                "XYIGQ10C231000502",
+//                "XYIGQ10C231000516",
+//                "XYIGQ10C231000520",
+//                "XYIGQ10C231000526",
+//                "XYIGQ10C231000543",
+//                "XYIGQ10C231000546",
+//                "XYIGQ10C231000556",
+//                "XYIGQ10C231000558",
+//                "XYIGQ10C231000561",
+//                "XYIGQ10C231000563",
+//                "XYIGQ10C231000569",
+//                "XYIGQ10C231000571",
+//                "XYIGQ10C231000576",
+//                "XYIGQ10C231000588",
+//                "XYIGQ10C231000592",
+//                "XYIGQ10C231000597",
+//                "XYIGQ10C231000601",
+//                "XYIGQ10C231000605",
+//                "XYIGQ10C231000608",
+//                "XYIGQ10C231000611",
+//                "XYIGQ10C231000613",
+//                "XYIGQ10C231000618",
+//                "XYIGQ10C231000619",
+//                "XYIGQ10C231000621",
+//                "XYIGQ10C231000627",
+//                "XYIGQ10C231000630",
+//                "XYIGQ10C231000633",
+//                "XYIGQ10C231000644",
+//                "XYIGQ10C231000647",
+//                "XYIGQ10C231000663",
+//                "XYIGQ10C231000664",
+//                "XYIGQ10C231000667",
+//                "XYIGQ10C231000668",
+//                "XYIGQ10C231000669",
+//                "XYIGQ10C231000671",
+//                "XYIGQ10C231000674",
+//                "XYIGQ10C231000675",
+//                "XYIGQ10C231000679",
+//                "XYIGQ10C231000681",
+//                "XYIGQ10C231000683",
+//                "XYIGQ10C231000689",
+//                "XYIGQ10C231000692",
+//                "XYIGQ10C231000698",
+//                "XYIGQ10C231000699",
+//                "XYYFV12XJ2403D001",
+//                "XYYFV12XJ2403C002"};
+//
+//        String s = "";
+//        Integer towerd = 0;
+//        for (String item :array) {
+//            towerd++;
+////            s+= "INSERT INTO `terminals`(id,`line_id`, `tower_id`, `cmdid`) VALUES("+towerd+",1," + towerd + ", '" + item + "');";
+//            s+= "INSERT INTO `terminal_channel_mapper`(`term_id`, `channel_id`) VALUES("+towerd+",1);";
+//            s+= "INSERT INTO `terminal_channel_mapper`(`term_id`, `channel_id`) VALUES("+towerd+",2);";
+//            s+= "INSERT INTO `terminal_channel_mapper`(`term_id`, `channel_id`) VALUES("+towerd+",3);";
+//        }
+//
+//        System.out.println(s);
+
+//        PermissionDetail permissionDetailFull = newCacheService.getPermissionDetailOver(24);
+//        System.out.println(permissionDetailFull.toString());
+
 
+        UpdateTowerVo towers = new UpdateTowerVo();
+        towers.setId(2);
+        towers.setName("ceshsish");
+        towers.setLineId(108);
+        towers.setOrder(1);
+        towers.setAddress("838837");
+        ServiceBody<String> serviceBody = towerService.updateTower(towers);
+        System.out.println(serviceBody);
     }
 
 }

xymanager_common/pom.xml

@@ -15,10 +15,20 @@
     </properties>
     <dependencies>
 
-        <!-- SpringWeb模块 -->
+        <!-- SpringBoot Web容器 -->
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Spring框架基本的核心工具 -->
@@ -33,6 +43,29 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+            <exclusions>
+                <!-- 排除 Lettuce -->
+                <exclusion>
+                    <groupId>io.lettuce</groupId>
+                    <artifactId>lettuce-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- 添加 Jedis -->
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.6.3</version> <!-- 可选，建议与 Spring Boot 2.x 兼容的最新版本 -->
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+
         <!--lombok-->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -51,12 +84,6 @@
             <artifactId>knife4j-spring-boot-starter</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>eu.bitwalker</groupId>-->
-<!--            <artifactId>UserAgentUtils</artifactId>-->
-<!--            <version>1.21</version>-->
-<!--        </dependency>-->
-
         <!--指定swagger-models版本，解决报错-->
         <dependency>
             <groupId>io.swagger</groupId>
@@ -74,6 +101,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
+        <!--用于解决tomcat中log4j2-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-web</artifactId>
+        </dependency>
 
 
         <!-- 阿里JSON解析器 -->
@@ -94,6 +126,16 @@
             <version>1.11</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.14</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5.14</version>
+        </dependency>
 
 
         <!-- 文件上传工具类 -->
@@ -111,6 +153,16 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--JNA:调用本地dll-->
@@ -123,31 +175,42 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
-<!--        &lt;!&ndash;shiro&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.apache.shiro</groupId>-->
-<!--            <artifactId>shiro-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>alibaba-dingtalk-service-sdk</artifactId>
+            <version>2.0.0</version>
+        </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-security</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId> <!-- or jjwt-gson if Gson is preferred -->
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.penggle</groupId>
+            <artifactId>kaptcha</artifactId>
+            <version>2.3.2</version>
+        </dependency>
 
+        <dependency>
+            <groupId>io.sigpipe</groupId>
+            <artifactId>jbsdiff</artifactId>
+            <version>1.0</version>
+        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

xymanager_common/src/main/java/com/shxy/xymanager_common/base/BaseController.java

@@ -20,6 +20,26 @@ import java.util.List;
  */
 public class BaseController {
 
+    protected Integer initPageNum(Integer pageNum) {
+        if (pageNum == null) {
+            pageNum = 1;
+        }
+        if (pageNum < 0) {
+            pageNum = 1;
+        }
+        return pageNum;
+    }
+
+    protected Integer initPageSize(Integer pageSize) {
+        if (pageSize == null) {
+            pageSize = 10;
+        }
+        if (pageSize < 1) {
+            pageSize = 1;
+        }
+        return pageSize;
+    }
+
     /**
      * 将前台传递过来的日期格式的字符串，自动转化为Date类型
      */
@@ -74,13 +94,14 @@ public class BaseController {
     /**
      * 响应请求分页数据
      */
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    protected TableDataInfo getDataTable(List<?> list) {
+    public static TableDataInfo getDataTable(List<?> list) {
         TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
-        rspData.setRows(list);
-        rspData.setTotal(new PageInfo(list).getTotal());
+        PageInfo pageInfo = new PageInfo(list);
+        rspData.setList(list);
+        rspData.setTotal(pageInfo.getTotal());
+        rspData.setTotalpage(pageInfo.getPages());
+        rspData.setPagesize(pageInfo.getPageSize());
+        rspData.setCurrentpage(pageInfo.getPageNum());
         return rspData;
     }
 
@@ -91,31 +112,4 @@ public class BaseController {
         return StringUtils.format("redirect:{}", url);
     }
 
-//    /**
-//     * 获取用户缓存信息
-//     */
-//    public LoginUser getLoginUser() {
-//        return SecurityUtils.getLoginUser();
-//    }
-//
-//    /**
-//     * 获取登录用户id
-//     */
-//    public Long getUserId() {
-//        return getLoginUser().getUserId();
-//    }
-//
-//    /**
-//     * 获取登录部门id
-//     */
-//    public Long getDeptId() {
-//        return getLoginUser().getDeptId();
-//    }
-//
-//    /**
-//     * 获取登录用户名
-//     */
-//    public String getUsername() {
-//        return getLoginUser().getUsername();
-//    }
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/base/ResponseReult.java

@@ -26,6 +26,8 @@ public class ResponseReult<T> implements Serializable {
     @ApiModelProperty(value = "返回描述", name = "返回描述")
     private String msg;
 
+
+
     public T getData() {
         return data;
     }
@@ -79,16 +81,21 @@ public class ResponseReult<T> implements Serializable {
         return response;
     }
 
+
     /**
-     * 返回失败消息
+     * 失败返回结果
      *
-     * @return 失败消息
+     * @param message 错误信息
      */
-    public static <T> ResponseReult<T> error() {
-        ResponseReult<T> response = ResponseReult.error(HttpStatus.HTTP_INTERNAL_ERROR, "操作失败");
-        return response;
+    public static <T> ResponseReult<T> fail(String message) {
+        return ResponseReult.error(HttpStatus.HTTP_BAD_REQUEST, message);
     }
 
+    public static <T> ResponseReult<T> fail(int code, String msg) {
+        ResponseReult<T> response = new ResponseReult<>();
+        response.setCode(code, msg);
+        return response;
+    }
     /**
      * 返回失败消息
      *

xymanager_common/src/main/java/com/shxy/xymanager_common/bean/MultipartConfig.java

@@ -18,8 +18,8 @@ public class MultipartConfig {
     MultipartConfigElement multipartConfigElement() {
         String os = System.getProperty("os.name");
         // 兼容windows
-        if(os.toLowerCase().startsWith("win")){
-            fileTempDir = "C:" + fileTempDir;
+        if (os.toLowerCase().startsWith("win")) {
+            fileTempDir = fileTempDir;
         }
         log.info("fileTempDir:{}", fileTempDir);
         MultipartConfigFactory factory = new MultipartConfigFactory();

xymanager_common/src/main/java/com/shxy/xymanager_common/bean/PermissionDetail.java

@@ -0,0 +1,62 @@
+package com.shxy.xymanager_common.bean;
+
+import com.shxy.xymanager_common.enums.CommonStatus;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 权限列表返回
+ *
+ * @author jingjing
+ */
+@Data
+public class PermissionDetail implements Serializable {
+
+    private List<Integer> dypList = new ArrayList<>();
+
+    private List<Integer> linepList = new ArrayList<>();
+
+    private List<Integer> towerpList = new ArrayList<>();
+
+    private List<Integer> termpList = new ArrayList<>();
+
+    private Integer isSuper = CommonStatus.DELETE.value();
+
+    private Integer uid;
+
+
+    public boolean hasDyId(Integer id) {
+        if (dypList.contains(id)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean hasLineId(Integer id) {
+        if (linepList.contains(id)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean hasTowerId(Integer id) {
+        if (towerpList.contains(id)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean hasTermId(Integer id) {
+        if (termpList.contains(id)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysOperLog.java

@@ -1,5 +1,6 @@
 package com.shxy.xymanager_common.bean;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -9,6 +10,7 @@ import java.io.Serializable;
  *
  * @author 晶晶
  */
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 public class SysOperLog implements Serializable {
     private static final long serialVersionUID = 1L;

xymanager_common/src/main/java/com/shxy/xymanager_common/bean/SysUser.java

@@ -43,19 +43,22 @@ public class SysUser {
     @ApiModelProperty(value="创建时间", name="createTime")
     private Date createTime;
 
+
     /**
      * 密码
      */
-
     private String password;
-
     /**
      * 帐号状态（0失效 1正常）
      */
-
     private String status;
 
-    public SysUser() {
-    }
+    /**
+     * 用户角色
+     */
+    @ApiModelProperty(value="角色名称", name="rolename")
+    private String roleName;
 
+    @ApiModelProperty(value="权限信息")
+    PermissionDetail permission;
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/config/CaptchaConfig.java

@@ -0,0 +1,38 @@
+package com.shxy.xymanager_common.config;
+
+import com.google.code.kaptcha.Constants;
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.google.code.kaptcha.util.Config;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+
+@Configuration
+public class CaptchaConfig {
+
+    @Bean(name = "captchaProducer")
+    public DefaultKaptcha getKaptchaBean() {
+        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
+        Properties properties = new Properties();
+
+        properties.setProperty(Constants.KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial, Helvetica");
+        properties.setProperty(Constants.KAPTCHA_BORDER, "no");
+        properties.setProperty(Constants.KAPTCHA_BORDER_COLOR, "0,0,0");
+        properties.setProperty("kaptcha.textproducer.font.color", "36,114,180");
+        properties.setProperty("kaptcha.textproducer.font.size", "40");
+        properties.setProperty("kaptcha.image.width", "160");
+        properties.setProperty("kaptcha.obscurificator.impl", "com.google.code.kaptcha.impl.WaterRipple");
+        properties.setProperty("kaptcha.textproducer.char.length", "4");
+        properties.setProperty("kaptcha.textproducer.char.string", "zxcvbnmasdfghjkqwertyupZXCVBNMASDFGHJKLQWERTYUP23456789");
+        properties.setProperty("kaptcha.word.impl", "com.google.code.kaptcha.text.impl.DefaultWordRenderer");
+        properties.setProperty("kaptcha.textproducer.impl", "com.google.code.kaptcha.text.impl.DefaultTextCreator");
+        properties.setProperty("kaptcha.background.clear.from", "255,255,255");
+        properties.setProperty("kaptcha.background.clear.to", "255,255,255");
+        properties.setProperty("kaptcha.noise.impl", "com.google.code.kaptcha.impl.NoNoise");
+        Config config = new Config(properties);
+        defaultKaptcha.setConfig(config);
+        return defaultKaptcha;
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/config/SecurityConfig.java

@@ -0,0 +1,92 @@
+package com.shxy.xymanager_common.config;
+
+import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.Set;
+
+
+@Configuration
+@Data
+@Slf4j
+public class SecurityConfig {
+
+    private String jwtPwd = "x11d11ddf@!dddd12efwefwefwd1111ff1111qefeffeefffdfdfdfa1d";
+
+    private String jwtHeader = "Authorization";
+
+    private String jwtPrefix = "Bearer";
+
+    // default 7 days
+    private Integer jwtExpiration = 7 * 24 * 60 * 60;
+
+    private List<String> urlWhiteList = Lists.newArrayList();
+
+
+    /**
+     * 是否开启权限认证
+     */
+    private Boolean enable = true;
+    /**
+     * 系统用户默认密码
+     */
+    private String defaultPwd = "Aa12345678";
+    /**
+     * 默认的静态资源过滤
+     */
+    private String staticResource = ".jpg,.jpeg,.js,.css,.png,.bmp,.gif,.ico,.mp3,.mp4,.svg";
+
+    private Set<String> resourceSuffix = Sets.newHashSet();
+
+    private List<String> swagger = Lists.newArrayList("/swagger**", "/webjars/**",
+            "/v2/api-docs/**", "/v3/api-docs/**", "/swagger-resources/**");
+
+    @PostConstruct
+    private void init() {
+        if (StringUtils.isNotBlank(staticResource)) {
+            this.resourceSuffix = Sets.newHashSet(staticResource.split(","));
+        }
+        urlWhiteList.addAll(swagger);
+        urlWhiteList.add("/api/login");
+        urlWhiteList.add("/xymanager/login");
+        urlWhiteList.add("/login");
+        urlWhiteList.add("/xymanager/doc.html");
+        urlWhiteList.add("/xymanager/swagger-ui.html");
+        urlWhiteList.add("/xymanager/swagger-resources/**");
+        urlWhiteList.add("/xymanager/*/api-docs");
+        urlWhiteList.add("/xymanager/websocket/**");
+        urlWhiteList.add("/test/**");
+        urlWhiteList.add("/error");
+        urlWhiteList.add("/xymanager/getPhotoListForOpen");
+        urlWhiteList.add("/xymanager/ctrlCmaDeviceCapture");
+        urlWhiteList.add("/xymanager/cmaDeviceStatus");
+        urlWhiteList.add("/xymanager/cmaUserLogin");
+        urlWhiteList.add("/xymanager/leadpulls/export");
+        urlWhiteList.add("/xymanager/weather/export");
+        urlWhiteList.add("/xymanager/upload/upload**");
+        urlWhiteList.add("/xymanager/henan/**");
+        urlWhiteList.add("/xymanager/kaptcha");
+        urlWhiteList.add("/xymanager/test/**");
+        urlWhiteList.add("/xymanager/mntn/**");
+        urlWhiteList.add("/xymanager/uploadPhoto");
+        urlWhiteList.add("/xymanager/uploadPatch");
+
+        StreamReadConstraints streamReadConstraints = StreamReadConstraints
+                .builder()
+                .maxStringLength(200000000)
+                .build();
+        objectMapper.getFactory().setStreamReadConstraints(streamReadConstraints);
+    }
+
+    @Autowired
+    private ObjectMapper objectMapper;
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java

@@ -5,40 +5,46 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 通用常量信息
- * 
- * @author xzg
+ *
+ * @author jingjing
  */
 @Component
-public class Constants
-{
+public class Constants {
 
     @Value("${cma.server}")
     public String cmServer;
 
     @Value("${cma.port}")
-    public  int cmaPort;
+    public int cmaPort;
 
-    private static String server;
+    public static String server;
 
-    private static int port;
+    public static int port;
 
     public static String CMD = "";
+    public static String newCMD = "";
+    public static String shpath = "/usr/local/bin/xympadmn";
+    public static String serverpath = "";
+    public static String portpath = "";
 
 
     @PostConstruct
-    private void init(){
+    private void init() {
         server = cmServer;
         port = cmaPort;
-        CMD = "/usr/local/bin/xympadmn --server="+server+" --port="+port+" --act=";
+        CMD = "/usr/local/bin/xympadmn --server=" + server + " --port=" + port + " --act=";
+        newCMD = "/usr/local/bin/xympadmn --server=" + server + " --port=" + port;
+        serverpath = "--server=" + server;
+        portpath = "--port=" + port;
     }
 
 
-
-
     /**
      * UTF-8 字符集
      */
@@ -182,8 +188,8 @@ public class Constants
     /**
      * 定时任务违规的字符
      */
-    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
-            "org.springframework.jndi" };
+    public static final String[] JOB_ERROR_STR = {"java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
+            "org.springframework.jndi"};
 
     /**
      * 心跳时间全局设置
@@ -193,7 +199,30 @@ public class Constants
     /**
      * 调用JNI自增ID
      */
-    public static AtomicInteger REQUEST_ID = new AtomicInteger((int) (System.currentTimeMillis()/1000 - 1672502400));   // Based On 2023-01-01 00:00:00
+    public static AtomicInteger REQUEST_ID = new AtomicInteger((int) (System.currentTimeMillis() / 1000 - 1672502400));   // Based On 2023-01-01 00:00:00
+
+    /**
+     * 超级管理员
+     */
+    public static int SUPER_ADMIN = 0;
+    public static String SUPER_ADMIN_NAME = "超级管理员";
 
+    /**
+     * Sim卡运营商
+     */
+    public static final Integer NetType_Dahan = 1;
+    public static final Integer NetType_Rabchaser = 2;
+    public static final Integer NetType_M2M10086 = 3;
+    public static final Integer NetType_LWWLKJ = 4;
+
+    public static ConcurrentHashMap<Integer, Integer> scheduleRequestMap = new ConcurrentHashMap<>();
+    public static HashMap<Integer, String> scheduleRequestDoneMap = new HashMap<>();
 
+    /**
+     * mqtt
+     */
+    public static String TopicPrefix = "/v1/devices/";
+    public static String DataSuffix = "/datas";
+    public static String RespSuffix = "/commandResponse";
+    public static String CmdSuffix = "/command";
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTerminalWithHeartDto.java

@@ -1,18 +0,0 @@
-package com.shxy.xymanager_common.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class DyLineAndTerminalWithHeartDto {
-
-    private Integer id;
-
-    private String name;
-
-    private Integer dyValue;
-
-    private List<LineAndTerminalWithHeartDto> list;
-
-}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/DyLineAndTowertDto.java

@@ -1,27 +0,0 @@
-package com.shxy.xymanager_common.dto;
-
-import lombok.Data;
-
-
-@Data
-public class DyLineAndTowertDto {
-
-    private Integer dyId;
-
-    private String dyName;
-
-    private Integer dyValue;
-
-    private Integer lineId;
-
-    private String lineName;
-
-    private String bsManufacturer;
-
-    private Integer dyLevelId;
-
-    private Integer towerId;
-
-    private String towerName;
-
-}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/GroupAlarmType.java

@@ -0,0 +1,21 @@
+package com.shxy.xymanager_common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+
+@Data
+public class GroupAlarmType implements Serializable {
+
+    private BigInteger num;
+
+    private Integer label;
+
+    private String name;
+
+    private String enname;
+
+    private static final long serialVersionUID = 1L;
+
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LastPicTimeDto.java

@@ -0,0 +1,16 @@
+package com.shxy.xymanager_common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.List;
+
+@Data
+public class LastPicTimeDto implements Serializable {
+
+    private BigInteger photoTime;
+
+    private static final long serialVersionUID = 1L;
+
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndDyNameDto.java

@@ -1,23 +0,0 @@
-package com.shxy.xymanager_common.dto;
-
-import lombok.Data;
-
-/**
- * 线路和电压等级名称对象
- */
-@Data
-public class LineAndDyNameDto {
-
-    private Integer id;
-
-    private String name;
-
-    private String bsManufacturer;
-
-    private Integer dyLevelId;
-
-    private String dyLevelName;
-
-    private Integer status;
-
-}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/LineAndTerminalWithHeartDto.java

@@ -1,20 +0,0 @@
-package com.shxy.xymanager_common.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class LineAndTerminalWithHeartDto {
-
-    private Integer id;
-
-    private String name;
-
-    private String bsManufacturer;
-
-    private Integer dyLevel;
-
-    private List<TerminalsWithHeart> list;
-
-}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/PhotoMarkDto.java

@@ -1,28 +0,0 @@
-package com.shxy.xymanager_common.dto;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PhotoMarkDto {
-
-    private Integer markId;
-
-    private Integer termId;
-
-    private Integer channelId;
-
-    private Integer width;
-
-    private Integer height;
-
-    private String color;
-
-    private String path;
-
-    private Short boderWidth;
-
-    private List<TermChannelCoordinateDto> list;
-
-}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/ScheduleDetailsDto.java

@@ -1,23 +1,70 @@
 package com.shxy.xymanager_common.dto;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.shxy.xymanager_common.util.DateUtil;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.sql.Time;
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
 @Data
 public class ScheduleDetailsDto implements Serializable {
     private Integer id;
-
     private Integer scheduleId;
-
     private Integer hour;
-
     private Integer minute;
-
     private Integer preset;
+    private String day;
+    private Integer before = 0;
+    private Integer delay = 0;
 
     private static final long serialVersionUID = 1L;
 
+    List<Date> timeList = new ArrayList<>();
+
+    public void initMinute(int min) {
+        hour = min / 60;
+        minute = min - hour * 60;
+        if (hour >= 24) {
+            hour = hour - 24;
+        }
+    }
+
+    public int calMinute() {
+        return hour * 60 + minute;
+    }
+
+    public boolean match(String day, int min) {
+        if (day.equals(this.day)) {
+            int cal = this.calMinute();
+            if (cal >= min) {
+                if (cal - min <= before) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                if (min - cal <= delay) {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isWrong() {
+        if (timeList.size() == 1) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelAndMapperDto.java

@@ -18,6 +18,8 @@ public class TermChannelAndMapperDto {
 
     private String alias;
 
+    private Integer type;
+
     private Integer status;
 
     private Integer maxResolutionWidth;

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelCoordinateDto.java

@@ -8,7 +8,6 @@ import lombok.Data;
 @Data
 public class TermChannelCoordinateDto {
 
-
     private float x1;
 
     private float x2;
@@ -17,5 +16,4 @@ public class TermChannelCoordinateDto {
 
     private float y1;
 
-
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalImgAlarmsAndPhotoDto.java

@@ -0,0 +1,59 @@
+package com.shxy.xymanager_common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+
+@Data
+public class TerminalImgAlarmsAndPhotoDto implements Serializable {
+
+    private BigInteger id;
+
+    private Integer termId;
+
+    private Integer channelId;
+
+    private Integer presetId;
+
+    private BigInteger photoOrgId;
+
+    private BigInteger alarmTime;
+
+    private Integer label;
+
+    private String name;
+
+    private String enname;
+
+    private Float prob;
+
+    private Float x;
+
+    private Float y;
+
+    private Float width;
+
+    private Float height;
+
+    private Integer isread;
+
+    private Integer mediaType;
+
+    private Integer photowidth;
+
+    private Integer photoheight;
+
+    private Integer fileSize;
+
+    private BigInteger photoTime;
+
+    private BigInteger recvTime;
+
+    private String path;
+
+    private String thumb;
+
+    private static final long serialVersionUID = 1L;
+
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndPositionDto.java

@@ -0,0 +1,25 @@
+package com.shxy.xymanager_common.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+
+@Data
+public class TerminalsAndPositionDto implements Serializable {
+    private Integer id;
+
+    private Integer towerId;
+
+    private String cmdId;
+
+    private Double latitude;
+
+    private Double longitude;
+
+    private Integer radius;
+
+    private static final long serialVersionUID = 1L;
+
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsAndStatusAndLastPicDto.java

@@ -8,48 +8,34 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-public class TerminalsAndStatusDto implements Serializable {
+public class TerminalsAndStatusAndLastPicDto implements Serializable {
     private Integer id;
 
-    private Integer lineid;
+    private Integer towerId;
 
-    private Integer towerid;
-
-    private String cmdid;
-
-    private Short orgId;
-
-    private String equipName;
+    private String cmdId;
 
     private String displayName;
 
-    private String model;
+    private Integer status;
 
-    private String essentialInfoVersion;
+    private Integer signalStrength4g;
 
-    private Byte hasPan;
+    private BigInteger bootTime;
 
-    private String bsManufacturer;
+    private float batteryCapacity;
 
-    private Date bsProductionDate;
+    private float batteryVoltage;
 
-    private String bsIdentifier;
+    private BigInteger lastHeartbeat;
 
     private Double latitude;
 
     private Double longitude;
 
-    private Integer status;
+    private Integer radius;
 
-    private Short signalStrength4g;
-
-    private BigInteger bootTime;
-
-    private float batteryCapacity;
-
-    private float batteryVoltage;
-
-    private BigInteger lastHeartbeat;
+    private List<LastPicTimeDto> list;
 
     private static final long serialVersionUID = 1L;
 

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TerminalsWithHeart.java

@@ -1,51 +0,0 @@
-package com.shxy.xymanager_common.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.Date;
-
-@Data
-public class TerminalsWithHeart implements Serializable {
-    private Integer id;
-
-    private Integer lineid;
-
-    private Integer towerid;
-
-    private String name;
-
-    private String cmdid;
-
-    private Short orgId;
-
-    private String equipname;
-
-    private String displayname;
-
-    private String model;
-
-    private String essentialInfoVersion;
-
-    private Byte hasPan;
-
-    private String bsManufacturer;
-
-    private Date bsProductionDate;
-
-    private String bsIdentifier;
-
-    private Double latitude;
-
-    private Double longitude;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    private BigInteger lastheartbeat;
-
-    private static final long serialVersionUID = 1L;
-
-}

xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TowerDto.java

@@ -14,6 +14,8 @@ public class TowerDto implements Serializable {
 
     private String lineName;
 
+    private String address;
+
     private Integer order;
 
     private Integer status;

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/CameraSchedule.java

@@ -0,0 +1,183 @@
+package com.shxy.xymanager_common.entity;
+
+import com.shxy.xymanager_common.dto.ScheduleDetailsDto;
+
+import java.util.List;
+
+public class CameraSchedule {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column camera_schedule.id
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column camera_schedule.term_id
+     *
+     * @mbg.generated
+     */
+    private Integer termId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column camera_schedule.channel_id
+     *
+     * @mbg.generated
+     */
+    private Integer channelId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column camera_schedule.protocol
+     *
+     * @mbg.generated
+     */
+    private Integer protocol;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column camera_schedule.data
+     *
+     * @mbg.generated
+     */
+    private String data;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column camera_schedule.id
+     *
+     * @return the value of camera_schedule.id
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column camera_schedule.id
+     *
+     * @param id the value for camera_schedule.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column camera_schedule.term_id
+     *
+     * @return the value of camera_schedule.term_id
+     *
+     * @mbg.generated
+     */
+    public Integer getTermId() {
+        return termId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column camera_schedule.term_id
+     *
+     * @param termId the value for camera_schedule.term_id
+     *
+     * @mbg.generated
+     */
+    public void setTermId(Integer termId) {
+        this.termId = termId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column camera_schedule.channel_id
+     *
+     * @return the value of camera_schedule.channel_id
+     *
+     * @mbg.generated
+     */
+    public Integer getChannelId() {
+        return channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column camera_schedule.channel_id
+     *
+     * @param channelId the value for camera_schedule.channel_id
+     *
+     * @mbg.generated
+     */
+    public void setChannelId(Integer channelId) {
+        this.channelId = channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column camera_schedule.protocol
+     *
+     * @return the value of camera_schedule.protocol
+     *
+     * @mbg.generated
+     */
+    public Integer getProtocol() {
+        return protocol;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column camera_schedule.protocol
+     *
+     * @param protocol the value for camera_schedule.protocol
+     *
+     * @mbg.generated
+     */
+    public void setProtocol(Integer protocol) {
+        this.protocol = protocol;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column camera_schedule.data
+     *
+     * @return the value of camera_schedule.data
+     *
+     * @mbg.generated
+     */
+    public String getData() {
+        return data;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column camera_schedule.data
+     *
+     * @param data the value for camera_schedule.data
+     *
+     * @mbg.generated
+     */
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    private List<ScheduleDetailsDto> list;
+
+    public List<ScheduleDetailsDto> getList() {
+        return list;
+    }
+
+    public void setList(List<ScheduleDetailsDto> list) {
+        this.list = list;
+    }
+
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/CameraScheduleExample.java

@@ -0,0 +1,541 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CameraScheduleExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public CameraScheduleExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNull() {
+            addCriterion("term_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNotNull() {
+            addCriterion("term_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdEqualTo(Integer value) {
+            addCriterion("term_id =", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotEqualTo(Integer value) {
+            addCriterion("term_id <>", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThan(Integer value) {
+            addCriterion("term_id >", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("term_id >=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThan(Integer value) {
+            addCriterion("term_id <", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThanOrEqualTo(Integer value) {
+            addCriterion("term_id <=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIn(List<Integer> values) {
+            addCriterion("term_id in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotIn(List<Integer> values) {
+            addCriterion("term_id not in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdBetween(Integer value1, Integer value2) {
+            addCriterion("term_id between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("term_id not between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNull() {
+            addCriterion("channel_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNotNull() {
+            addCriterion("channel_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdEqualTo(Integer value) {
+            addCriterion("channel_id =", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotEqualTo(Integer value) {
+            addCriterion("channel_id <>", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThan(Integer value) {
+            addCriterion("channel_id >", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("channel_id >=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThan(Integer value) {
+            addCriterion("channel_id <", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThanOrEqualTo(Integer value) {
+            addCriterion("channel_id <=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIn(List<Integer> values) {
+            addCriterion("channel_id in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotIn(List<Integer> values) {
+            addCriterion("channel_id not in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdBetween(Integer value1, Integer value2) {
+            addCriterion("channel_id between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("channel_id not between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolIsNull() {
+            addCriterion("protocol is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolIsNotNull() {
+            addCriterion("protocol is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolEqualTo(Integer value) {
+            addCriterion("protocol =", value, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolNotEqualTo(Integer value) {
+            addCriterion("protocol <>", value, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolGreaterThan(Integer value) {
+            addCriterion("protocol >", value, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolGreaterThanOrEqualTo(Integer value) {
+            addCriterion("protocol >=", value, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolLessThan(Integer value) {
+            addCriterion("protocol <", value, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolLessThanOrEqualTo(Integer value) {
+            addCriterion("protocol <=", value, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolIn(List<Integer> values) {
+            addCriterion("protocol in", values, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolNotIn(List<Integer> values) {
+            addCriterion("protocol not in", values, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolBetween(Integer value1, Integer value2) {
+            addCriterion("protocol between", value1, value2, "protocol");
+            return (Criteria) this;
+        }
+
+        public Criteria andProtocolNotBetween(Integer value1, Integer value2) {
+            addCriterion("protocol not between", value1, value2, "protocol");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table camera_schedule
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table camera_schedule
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DevType.java

@@ -0,0 +1,20 @@
+package com.shxy.xymanager_common.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class DevType implements Serializable {
+    private Integer id;
+
+    private String name;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DevTypeExample.java

@@ -0,0 +1,451 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DevTypeExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DevTypeExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevel.java

@@ -1,24 +1,62 @@
 package com.shxy.xymanager_common.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@ApiModel(value = "电压", description = "电压")
 public class DyLevel implements Serializable {
+    @ApiModelProperty(value = "电压编号", example = "123456")
     private Integer id;
 
+    @ApiModelProperty(value = "电压名称", example = "AAAA")
     private String name;
 
+    @ApiModelProperty(value = "电压大小", example = "AAAA")
     private Integer dyValue;
 
+    @ApiModelProperty(value = "电压状态", example = "AAAA")
     private Integer status;
 
     private Date createTime;
 
     private Date updateTime;
 
+    @ApiModelProperty(value = "线路列表", example = "[]")
+    public List<Lines> list = new ArrayList<>();
+
+    private boolean checked;
+
+    public void setCheck(boolean check) {
+        checked = check;
+        if (checked) {
+            for (Lines item : list) {
+                item.setCheck(checked);
+            }
+        }
+    }
+
+    public boolean checkInclude() {
+        if (checked) {
+            return true;
+        } else {
+            for (Lines item : list) {
+                if (item.checkInclude()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
     private static final long serialVersionUID = 1L;
 
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/DyLevelExample.java

@@ -0,0 +1,571 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class DyLevelExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DyLevelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueIsNull() {
+            addCriterion("dy_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueIsNotNull() {
+            addCriterion("dy_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueEqualTo(Integer value) {
+            addCriterion("dy_value =", value, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueNotEqualTo(Integer value) {
+            addCriterion("dy_value <>", value, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueGreaterThan(Integer value) {
+            addCriterion("dy_value >", value, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueGreaterThanOrEqualTo(Integer value) {
+            addCriterion("dy_value >=", value, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueLessThan(Integer value) {
+            addCriterion("dy_value <", value, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueLessThanOrEqualTo(Integer value) {
+            addCriterion("dy_value <=", value, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueIn(List<Integer> values) {
+            addCriterion("dy_value in", values, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueNotIn(List<Integer> values) {
+            addCriterion("dy_value not in", values, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueBetween(Integer value1, Integer value2) {
+            addCriterion("dy_value between", value1, value2, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyValueNotBetween(Integer value1, Integer value2) {
+            addCriterion("dy_value not between", value1, value2, "dyValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Lines.java

@@ -1,21 +1,75 @@
 package com.shxy.xymanager_common.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Data
+@ApiModel(value = "线路", description = "线路")
 public class Lines implements Serializable {
+
+    private Integer onlinenum;
+
+    private Integer totalnum;
+
+    @ApiModelProperty(value = "线路编号", example = "123456")
     private Integer id;
 
+    @ApiModelProperty(value = "线路名称", example = "AAAA")
     private String name;
 
+    @ApiModelProperty(value = "单位", example = "123456")
     private String bsManufacturer;
 
     private Integer dyLevelId;
 
+    @ApiModelProperty(value = "线路状态", example = "AAAA")
     private Integer status;
 
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String photoCount;
+
+    private String photoRate;
+
+    @ApiModelProperty(value = "电压等级名称", example = "123456")
+    private String dyLevelName;
+
+    @ApiModelProperty(value = "杆塔信息", example = "123456")
+    private List<Towers> list = new ArrayList<>();
+
+    private boolean checked;
+
+    public void setCheck(boolean check) {
+        checked = check;
+        if (checked) {
+            for (Towers item : list) {
+                item.setCheck(checked);
+            }
+        }
+    }
+
+    public boolean checkInclude() {
+        if (checked) {
+            return true;
+        } else {
+            for (Towers item : list) {
+                if (item.checkInclude()) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
     private static final long serialVersionUID = 1L;
 
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/LinesExample.java

@@ -0,0 +1,701 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class LinesExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public LinesExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerIsNull() {
+            addCriterion("bs_manufacturer is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerIsNotNull() {
+            addCriterion("bs_manufacturer is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerEqualTo(String value) {
+            addCriterion("bs_manufacturer =", value, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerNotEqualTo(String value) {
+            addCriterion("bs_manufacturer <>", value, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerGreaterThan(String value) {
+            addCriterion("bs_manufacturer >", value, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerGreaterThanOrEqualTo(String value) {
+            addCriterion("bs_manufacturer >=", value, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerLessThan(String value) {
+            addCriterion("bs_manufacturer <", value, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerLessThanOrEqualTo(String value) {
+            addCriterion("bs_manufacturer <=", value, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerLike(String value) {
+            addCriterion("bs_manufacturer like", value, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerNotLike(String value) {
+            addCriterion("bs_manufacturer not like", value, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerIn(List<String> values) {
+            addCriterion("bs_manufacturer in", values, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerNotIn(List<String> values) {
+            addCriterion("bs_manufacturer not in", values, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerBetween(String value1, String value2) {
+            addCriterion("bs_manufacturer between", value1, value2, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andBsManufacturerNotBetween(String value1, String value2) {
+            addCriterion("bs_manufacturer not between", value1, value2, "bsManufacturer");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdIsNull() {
+            addCriterion("dy_level_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdIsNotNull() {
+            addCriterion("dy_level_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdEqualTo(Integer value) {
+            addCriterion("dy_level_id =", value, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdNotEqualTo(Integer value) {
+            addCriterion("dy_level_id <>", value, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdGreaterThan(Integer value) {
+            addCriterion("dy_level_id >", value, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("dy_level_id >=", value, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdLessThan(Integer value) {
+            addCriterion("dy_level_id <", value, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdLessThanOrEqualTo(Integer value) {
+            addCriterion("dy_level_id <=", value, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdIn(List<Integer> values) {
+            addCriterion("dy_level_id in", values, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdNotIn(List<Integer> values) {
+            addCriterion("dy_level_id not in", values, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdBetween(Integer value1, Integer value2) {
+            addCriterion("dy_level_id between", value1, value2, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDyLevelIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("dy_level_id not between", value1, value2, "dyLevelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("status =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("status <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("status >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("status >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("status <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("status <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("status in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("status not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("status between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("status not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesIsNull() {
+            addCriterion("tes is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesIsNotNull() {
+            addCriterion("tes is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesEqualTo(Float value) {
+            addCriterion("tes =", value, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesNotEqualTo(Float value) {
+            addCriterion("tes <>", value, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesGreaterThan(Float value) {
+            addCriterion("tes >", value, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesGreaterThanOrEqualTo(Float value) {
+            addCriterion("tes >=", value, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesLessThan(Float value) {
+            addCriterion("tes <", value, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesLessThanOrEqualTo(Float value) {
+            addCriterion("tes <=", value, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesIn(List<Float> values) {
+            addCriterion("tes in", values, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesNotIn(List<Float> values) {
+            addCriterion("tes not in", values, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesBetween(Float value1, Float value2) {
+            addCriterion("tes between", value1, value2, "tes");
+            return (Criteria) this;
+        }
+
+        public Criteria andTesNotBetween(Float value1, Float value2) {
+            addCriterion("tes not between", value1, value2, "tes");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnActivities.java

@@ -0,0 +1,247 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.Date;
+import java.util.List;
+
+public class MntnActivities {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activities.id
+     *
+     * @mbg.generated
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activities.title
+     *
+     * @mbg.generated
+     */
+    private String title;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activities.term_count
+     *
+     * @mbg.generated
+     */
+    private Integer termCount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activities.lost_count
+     *
+     * @mbg.generated
+     */
+    private Integer lostCount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activities.status
+     *
+     * @mbg.generated
+     */
+    private Byte status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activities.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activities.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activities.id
+     *
+     * @return the value of mntn_activities.id
+     *
+     * @mbg.generated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activities.id
+     *
+     * @param id the value for mntn_activities.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activities.title
+     *
+     * @return the value of mntn_activities.title
+     *
+     * @mbg.generated
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activities.title
+     *
+     * @param title the value for mntn_activities.title
+     *
+     * @mbg.generated
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activities.term_count
+     *
+     * @return the value of mntn_activities.term_count
+     *
+     * @mbg.generated
+     */
+    public Integer getTermCount() {
+        return termCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activities.term_count
+     *
+     * @param termCount the value for mntn_activities.term_count
+     *
+     * @mbg.generated
+     */
+    public void setTermCount(Integer termCount) {
+        this.termCount = termCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activities.lost_count
+     *
+     * @return the value of mntn_activities.lost_count
+     *
+     * @mbg.generated
+     */
+    public Integer getLostCount() {
+        return lostCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activities.lost_count
+     *
+     * @param lostCount the value for mntn_activities.lost_count
+     *
+     * @mbg.generated
+     */
+    public void setLostCount(Integer lostCount) {
+        this.lostCount = lostCount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activities.status
+     *
+     * @return the value of mntn_activities.status
+     *
+     * @mbg.generated
+     */
+    public Byte getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activities.status
+     *
+     * @param status the value for mntn_activities.status
+     *
+     * @mbg.generated
+     */
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activities.create_time
+     *
+     * @return the value of mntn_activities.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activities.create_time
+     *
+     * @param createTime the value for mntn_activities.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activities.update_time
+     *
+     * @return the value of mntn_activities.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activities.update_time
+     *
+     * @param updateTime the value for mntn_activities.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    private List<Terminals> terms;
+
+    public List<Terminals> getTerms() {
+        return terms;
+    }
+
+    public void setTerms(List<Terminals> terms) {
+        this.terms = terms;
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnActivitiesExample.java

@@ -0,0 +1,732 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MntnActivitiesExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public MntnActivitiesExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNull() {
+            addCriterion("title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNotNull() {
+            addCriterion("title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleEqualTo(String value) {
+            addCriterion("title =", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotEqualTo(String value) {
+            addCriterion("title <>", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThan(String value) {
+            addCriterion("title >", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("title >=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThan(String value) {
+            addCriterion("title <", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThanOrEqualTo(String value) {
+            addCriterion("title <=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLike(String value) {
+            addCriterion("title like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotLike(String value) {
+            addCriterion("title not like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIn(List<String> values) {
+            addCriterion("title in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotIn(List<String> values) {
+            addCriterion("title not in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleBetween(String value1, String value2) {
+            addCriterion("title between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotBetween(String value1, String value2) {
+            addCriterion("title not between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountIsNull() {
+            addCriterion("term_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountIsNotNull() {
+            addCriterion("term_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountEqualTo(Integer value) {
+            addCriterion("term_count =", value, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountNotEqualTo(Integer value) {
+            addCriterion("term_count <>", value, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountGreaterThan(Integer value) {
+            addCriterion("term_count >", value, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("term_count >=", value, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountLessThan(Integer value) {
+            addCriterion("term_count <", value, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountLessThanOrEqualTo(Integer value) {
+            addCriterion("term_count <=", value, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountIn(List<Integer> values) {
+            addCriterion("term_count in", values, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountNotIn(List<Integer> values) {
+            addCriterion("term_count not in", values, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountBetween(Integer value1, Integer value2) {
+            addCriterion("term_count between", value1, value2, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("term_count not between", value1, value2, "termCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountIsNull() {
+            addCriterion("lost_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountIsNotNull() {
+            addCriterion("lost_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountEqualTo(Integer value) {
+            addCriterion("lost_count =", value, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountNotEqualTo(Integer value) {
+            addCriterion("lost_count <>", value, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountGreaterThan(Integer value) {
+            addCriterion("lost_count >", value, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("lost_count >=", value, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountLessThan(Integer value) {
+            addCriterion("lost_count <", value, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountLessThanOrEqualTo(Integer value) {
+            addCriterion("lost_count <=", value, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountIn(List<Integer> values) {
+            addCriterion("lost_count in", values, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountNotIn(List<Integer> values) {
+            addCriterion("lost_count not in", values, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountBetween(Integer value1, Integer value2) {
+            addCriterion("lost_count between", value1, value2, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andLostCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("lost_count not between", value1, value2, "lostCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Byte value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Byte value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Byte value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Byte value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Byte> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Byte> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Byte value1, Byte value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_activities
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_activities
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnActivityTerminals.java

@@ -0,0 +1,38 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.Date;
+
+public class MntnActivityTerminals extends MntnActivityTerminalsKey {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activity_terminals.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activity_terminals.create_time
+     *
+     * @return the value of mntn_activity_terminals.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activity_terminals.create_time
+     *
+     * @param createTime the value for mntn_activity_terminals.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnActivityTerminalsExample.java

@@ -0,0 +1,482 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MntnActivityTerminalsExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public MntnActivityTerminalsExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andActivityIdIsNull() {
+            addCriterion("activity_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdIsNotNull() {
+            addCriterion("activity_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdEqualTo(Integer value) {
+            addCriterion("activity_id =", value, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdNotEqualTo(Integer value) {
+            addCriterion("activity_id <>", value, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdGreaterThan(Integer value) {
+            addCriterion("activity_id >", value, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("activity_id >=", value, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdLessThan(Integer value) {
+            addCriterion("activity_id <", value, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdLessThanOrEqualTo(Integer value) {
+            addCriterion("activity_id <=", value, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdIn(List<Integer> values) {
+            addCriterion("activity_id in", values, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdNotIn(List<Integer> values) {
+            addCriterion("activity_id not in", values, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdBetween(Integer value1, Integer value2) {
+            addCriterion("activity_id between", value1, value2, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andActivityIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("activity_id not between", value1, value2, "activityId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNull() {
+            addCriterion("term_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNotNull() {
+            addCriterion("term_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdEqualTo(Integer value) {
+            addCriterion("term_id =", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotEqualTo(Integer value) {
+            addCriterion("term_id <>", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThan(Integer value) {
+            addCriterion("term_id >", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("term_id >=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThan(Integer value) {
+            addCriterion("term_id <", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThanOrEqualTo(Integer value) {
+            addCriterion("term_id <=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIn(List<Integer> values) {
+            addCriterion("term_id in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotIn(List<Integer> values) {
+            addCriterion("term_id not in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdBetween(Integer value1, Integer value2) {
+            addCriterion("term_id between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("term_id not between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_activity_terminals
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnActivityTerminalsKey.java

@@ -0,0 +1,69 @@
+package com.shxy.xymanager_common.entity;
+
+public class MntnActivityTerminalsKey {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activity_terminals.activity_id
+     *
+     * @mbg.generated
+     */
+    private Integer activityId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_activity_terminals.term_id
+     *
+     * @mbg.generated
+     */
+    private Integer termId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activity_terminals.activity_id
+     *
+     * @return the value of mntn_activity_terminals.activity_id
+     *
+     * @mbg.generated
+     */
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activity_terminals.activity_id
+     *
+     * @param activityId the value for mntn_activity_terminals.activity_id
+     *
+     * @mbg.generated
+     */
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_activity_terminals.term_id
+     *
+     * @return the value of mntn_activity_terminals.term_id
+     *
+     * @mbg.generated
+     */
+    public Integer getTermId() {
+        return termId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_activity_terminals.term_id
+     *
+     * @param termId the value for mntn_activity_terminals.term_id
+     *
+     * @mbg.generated
+     */
+    public void setTermId(Integer termId) {
+        this.termId = termId;
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdHistory.java

@@ -0,0 +1,389 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.Date;
+import java.util.HashMap;
+
+public class MntnCmdHistory {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.term_id
+     *
+     * @mbg.generated
+     */
+    private Integer termId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.cmd
+     *
+     * @mbg.generated
+     */
+    private String cmd;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.desc
+     *
+     * @mbg.generated
+     */
+    private String desc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.status
+     *
+     * @mbg.generated
+     */
+    private Integer status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.publish_time
+     *
+     * @mbg.generated
+     */
+    private Date publishTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.result
+     *
+     * @mbg.generated
+     */
+    private Integer result;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.res_time
+     *
+     * @mbg.generated
+     */
+    private Date resTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_history.content
+     *
+     * @mbg.generated
+     */
+    private String content;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.id
+     *
+     * @return the value of mntn_cmd_history.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.id
+     *
+     * @param id the value for mntn_cmd_history.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.term_id
+     *
+     * @return the value of mntn_cmd_history.term_id
+     *
+     * @mbg.generated
+     */
+    public Integer getTermId() {
+        return termId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.term_id
+     *
+     * @param termId the value for mntn_cmd_history.term_id
+     *
+     * @mbg.generated
+     */
+    public void setTermId(Integer termId) {
+        this.termId = termId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.name
+     *
+     * @return the value of mntn_cmd_history.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.name
+     *
+     * @param name the value for mntn_cmd_history.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.cmd
+     *
+     * @return the value of mntn_cmd_history.cmd
+     *
+     * @mbg.generated
+     */
+    public String getCmd() {
+        return cmd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.cmd
+     *
+     * @param cmd the value for mntn_cmd_history.cmd
+     *
+     * @mbg.generated
+     */
+    public void setCmd(String cmd) {
+        this.cmd = cmd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.desc
+     *
+     * @return the value of mntn_cmd_history.desc
+     *
+     * @mbg.generated
+     */
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.desc
+     *
+     * @param desc the value for mntn_cmd_history.desc
+     *
+     * @mbg.generated
+     */
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.status
+     *
+     * @return the value of mntn_cmd_history.status
+     *
+     * @mbg.generated
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.status
+     *
+     * @param status the value for mntn_cmd_history.status
+     *
+     * @mbg.generated
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.create_time
+     *
+     * @return the value of mntn_cmd_history.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.create_time
+     *
+     * @param createTime the value for mntn_cmd_history.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.publish_time
+     *
+     * @return the value of mntn_cmd_history.publish_time
+     *
+     * @mbg.generated
+     */
+    public Date getPublishTime() {
+        return publishTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.publish_time
+     *
+     * @param publishTime the value for mntn_cmd_history.publish_time
+     *
+     * @mbg.generated
+     */
+    public void setPublishTime(Date publishTime) {
+        this.publishTime = publishTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.result
+     *
+     * @return the value of mntn_cmd_history.result
+     *
+     * @mbg.generated
+     */
+    public Integer getResult() {
+        return result;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.result
+     *
+     * @param result the value for mntn_cmd_history.result
+     *
+     * @mbg.generated
+     */
+    public void setResult(Integer result) {
+        this.result = result;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.res_time
+     *
+     * @return the value of mntn_cmd_history.res_time
+     *
+     * @mbg.generated
+     */
+    public Date getResTime() {
+        return resTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.res_time
+     *
+     * @param resTime the value for mntn_cmd_history.res_time
+     *
+     * @mbg.generated
+     */
+    public void setResTime(Date resTime) {
+        this.resTime = resTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_history.content
+     *
+     * @return the value of mntn_cmd_history.content
+     *
+     * @mbg.generated
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_history.content
+     *
+     * @param content the value for mntn_cmd_history.content
+     *
+     * @mbg.generated
+     */
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    private Terminals terminal;
+
+    public Terminals getTerminal() {
+        return terminal;
+    }
+
+    public void setTerminal(Terminals terminal) {
+        this.terminal = terminal;
+    }
+
+    private HashMap<String, Object> cmdMap;
+
+    public HashMap<String, Object> getCmdMap() {
+        return cmdMap;
+    }
+
+    public void setCmdMap(HashMap<String, Object> cmdMap) {
+        this.cmdMap = cmdMap;
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdHistoryExample.java

@@ -0,0 +1,932 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MntnCmdHistoryExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public MntnCmdHistoryExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNull() {
+            addCriterion("term_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNotNull() {
+            addCriterion("term_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdEqualTo(Integer value) {
+            addCriterion("term_id =", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotEqualTo(Integer value) {
+            addCriterion("term_id <>", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThan(Integer value) {
+            addCriterion("term_id >", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("term_id >=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThan(Integer value) {
+            addCriterion("term_id <", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThanOrEqualTo(Integer value) {
+            addCriterion("term_id <=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIn(List<Integer> values) {
+            addCriterion("term_id in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotIn(List<Integer> values) {
+            addCriterion("term_id not in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdBetween(Integer value1, Integer value2) {
+            addCriterion("term_id between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("term_id not between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("`name` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("`name` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("`name` =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("`name` <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("`name` >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("`name` >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("`name` <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("`name` <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("`name` like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("`name` not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("`name` in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("`name` not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("`name` between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("`name` not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdIsNull() {
+            addCriterion("cmd is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdIsNotNull() {
+            addCriterion("cmd is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdEqualTo(String value) {
+            addCriterion("cmd =", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdNotEqualTo(String value) {
+            addCriterion("cmd <>", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdGreaterThan(String value) {
+            addCriterion("cmd >", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdGreaterThanOrEqualTo(String value) {
+            addCriterion("cmd >=", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdLessThan(String value) {
+            addCriterion("cmd <", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdLessThanOrEqualTo(String value) {
+            addCriterion("cmd <=", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdLike(String value) {
+            addCriterion("cmd like", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdNotLike(String value) {
+            addCriterion("cmd not like", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdIn(List<String> values) {
+            addCriterion("cmd in", values, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdNotIn(List<String> values) {
+            addCriterion("cmd not in", values, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdBetween(String value1, String value2) {
+            addCriterion("cmd between", value1, value2, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdNotBetween(String value1, String value2) {
+            addCriterion("cmd not between", value1, value2, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIsNull() {
+            addCriterion("`desc` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIsNotNull() {
+            addCriterion("`desc` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescEqualTo(String value) {
+            addCriterion("`desc` =", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotEqualTo(String value) {
+            addCriterion("`desc` <>", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescGreaterThan(String value) {
+            addCriterion("`desc` >", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescGreaterThanOrEqualTo(String value) {
+            addCriterion("`desc` >=", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLessThan(String value) {
+            addCriterion("`desc` <", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLessThanOrEqualTo(String value) {
+            addCriterion("`desc` <=", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLike(String value) {
+            addCriterion("`desc` like", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotLike(String value) {
+            addCriterion("`desc` not like", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIn(List<String> values) {
+            addCriterion("`desc` in", values, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotIn(List<String> values) {
+            addCriterion("`desc` not in", values, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescBetween(String value1, String value2) {
+            addCriterion("`desc` between", value1, value2, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotBetween(String value1, String value2) {
+            addCriterion("`desc` not between", value1, value2, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIsNull() {
+            addCriterion("publish_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIsNotNull() {
+            addCriterion("publish_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeEqualTo(Date value) {
+            addCriterion("publish_time =", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotEqualTo(Date value) {
+            addCriterion("publish_time <>", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeGreaterThan(Date value) {
+            addCriterion("publish_time >", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("publish_time >=", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeLessThan(Date value) {
+            addCriterion("publish_time <", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeLessThanOrEqualTo(Date value) {
+            addCriterion("publish_time <=", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIn(List<Date> values) {
+            addCriterion("publish_time in", values, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotIn(List<Date> values) {
+            addCriterion("publish_time not in", values, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeBetween(Date value1, Date value2) {
+            addCriterion("publish_time between", value1, value2, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotBetween(Date value1, Date value2) {
+            addCriterion("publish_time not between", value1, value2, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIsNull() {
+            addCriterion("`result` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIsNotNull() {
+            addCriterion("`result` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultEqualTo(Integer value) {
+            addCriterion("`result` =", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultNotEqualTo(Integer value) {
+            addCriterion("`result` <>", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultGreaterThan(Integer value) {
+            addCriterion("`result` >", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`result` >=", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultLessThan(Integer value) {
+            addCriterion("`result` <", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultLessThanOrEqualTo(Integer value) {
+            addCriterion("`result` <=", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIn(List<Integer> values) {
+            addCriterion("`result` in", values, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultNotIn(List<Integer> values) {
+            addCriterion("`result` not in", values, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultBetween(Integer value1, Integer value2) {
+            addCriterion("`result` between", value1, value2, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultNotBetween(Integer value1, Integer value2) {
+            addCriterion("`result` not between", value1, value2, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeIsNull() {
+            addCriterion("res_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeIsNotNull() {
+            addCriterion("res_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeEqualTo(Date value) {
+            addCriterion("res_time =", value, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeNotEqualTo(Date value) {
+            addCriterion("res_time <>", value, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeGreaterThan(Date value) {
+            addCriterion("res_time >", value, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("res_time >=", value, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeLessThan(Date value) {
+            addCriterion("res_time <", value, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeLessThanOrEqualTo(Date value) {
+            addCriterion("res_time <=", value, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeIn(List<Date> values) {
+            addCriterion("res_time in", values, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeNotIn(List<Date> values) {
+            addCriterion("res_time not in", values, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeBetween(Date value1, Date value2) {
+            addCriterion("res_time between", value1, value2, "resTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andResTimeNotBetween(Date value1, Date value2) {
+            addCriterion("res_time not between", value1, value2, "resTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmd_history
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdResults.java

@@ -0,0 +1,137 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.Date;
+
+public class MntnCmdResults {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_results.cid
+     *
+     * @mbg.generated
+     */
+    private Integer cid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_results.result
+     *
+     * @mbg.generated
+     */
+    private Integer result;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_results.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmd_results.content
+     *
+     * @mbg.generated
+     */
+    private String content;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_results.cid
+     *
+     * @return the value of mntn_cmd_results.cid
+     *
+     * @mbg.generated
+     */
+    public Integer getCid() {
+        return cid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_results.cid
+     *
+     * @param cid the value for mntn_cmd_results.cid
+     *
+     * @mbg.generated
+     */
+    public void setCid(Integer cid) {
+        this.cid = cid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_results.result
+     *
+     * @return the value of mntn_cmd_results.result
+     *
+     * @mbg.generated
+     */
+    public Integer getResult() {
+        return result;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_results.result
+     *
+     * @param result the value for mntn_cmd_results.result
+     *
+     * @mbg.generated
+     */
+    public void setResult(Integer result) {
+        this.result = result;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_results.create_time
+     *
+     * @return the value of mntn_cmd_results.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_results.create_time
+     *
+     * @param createTime the value for mntn_cmd_results.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmd_results.content
+     *
+     * @return the value of mntn_cmd_results.content
+     *
+     * @mbg.generated
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmd_results.content
+     *
+     * @param content the value for mntn_cmd_results.content
+     *
+     * @mbg.generated
+     */
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdResultsExample.java

@@ -0,0 +1,482 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MntnCmdResultsExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public MntnCmdResultsExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andCidIsNull() {
+            addCriterion("cid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidIsNotNull() {
+            addCriterion("cid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidEqualTo(Integer value) {
+            addCriterion("cid =", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotEqualTo(Integer value) {
+            addCriterion("cid <>", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidGreaterThan(Integer value) {
+            addCriterion("cid >", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("cid >=", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidLessThan(Integer value) {
+            addCriterion("cid <", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidLessThanOrEqualTo(Integer value) {
+            addCriterion("cid <=", value, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidIn(List<Integer> values) {
+            addCriterion("cid in", values, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotIn(List<Integer> values) {
+            addCriterion("cid not in", values, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidBetween(Integer value1, Integer value2) {
+            addCriterion("cid between", value1, value2, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andCidNotBetween(Integer value1, Integer value2) {
+            addCriterion("cid not between", value1, value2, "cid");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIsNull() {
+            addCriterion("`result` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIsNotNull() {
+            addCriterion("`result` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultEqualTo(Integer value) {
+            addCriterion("`result` =", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultNotEqualTo(Integer value) {
+            addCriterion("`result` <>", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultGreaterThan(Integer value) {
+            addCriterion("`result` >", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`result` >=", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultLessThan(Integer value) {
+            addCriterion("`result` <", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultLessThanOrEqualTo(Integer value) {
+            addCriterion("`result` <=", value, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultIn(List<Integer> values) {
+            addCriterion("`result` in", values, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultNotIn(List<Integer> values) {
+            addCriterion("`result` not in", values, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultBetween(Integer value1, Integer value2) {
+            addCriterion("`result` between", value1, value2, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultNotBetween(Integer value1, Integer value2) {
+            addCriterion("`result` not between", value1, value2, "result");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmd_results
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmds.java

@@ -0,0 +1,241 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.Date;
+import java.util.HashMap;
+
+public class MntnCmds {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmds.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmds.term_id
+     *
+     * @mbg.generated
+     */
+    private Integer termId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmds.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmds.cmd
+     *
+     * @mbg.generated
+     */
+    private String cmd;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmds.desc
+     *
+     * @mbg.generated
+     */
+    private String desc;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_cmds.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmds.id
+     *
+     * @return the value of mntn_cmds.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmds.id
+     *
+     * @param id the value for mntn_cmds.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmds.term_id
+     *
+     * @return the value of mntn_cmds.term_id
+     *
+     * @mbg.generated
+     */
+    public Integer getTermId() {
+        return termId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmds.term_id
+     *
+     * @param termId the value for mntn_cmds.term_id
+     *
+     * @mbg.generated
+     */
+    public void setTermId(Integer termId) {
+        this.termId = termId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmds.name
+     *
+     * @return the value of mntn_cmds.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmds.name
+     *
+     * @param name the value for mntn_cmds.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmds.cmd
+     *
+     * @return the value of mntn_cmds.cmd
+     *
+     * @mbg.generated
+     */
+    public String getCmd() {
+        return cmd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmds.cmd
+     *
+     * @param cmd the value for mntn_cmds.cmd
+     *
+     * @mbg.generated
+     */
+    public void setCmd(String cmd) {
+        this.cmd = cmd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmds.desc
+     *
+     * @return the value of mntn_cmds.desc
+     *
+     * @mbg.generated
+     */
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmds.desc
+     *
+     * @param desc the value for mntn_cmds.desc
+     *
+     * @mbg.generated
+     */
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_cmds.create_time
+     *
+     * @return the value of mntn_cmds.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_cmds.create_time
+     *
+     * @param createTime the value for mntn_cmds.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    private Terminals terminal;
+    private HashMap<String, Object> cmdMap;
+    private Long prevReportTime;
+    private Long estimatedPublishTime;
+
+    public Terminals getTerminal() {
+        return terminal;
+    }
+
+    public void setTerminal(Terminals terminal) {
+        this.terminal = terminal;
+    }
+
+    public HashMap<String, Object> getCmdMap() {
+        return cmdMap;
+    }
+
+    public void setCmdMap(HashMap<String, Object> cmdMap) {
+        this.cmdMap = cmdMap;
+    }
+
+    public Long getPrevReportTime() {
+        return prevReportTime;
+    }
+
+    public void setPrevReportTime(Long prevReportTime) {
+        this.prevReportTime = prevReportTime;
+    }
+
+    public Long getEstimatedPublishTime() {
+        return estimatedPublishTime;
+    }
+
+    public void setEstimatedPublishTime(Long estimatedPublishTime) {
+        this.estimatedPublishTime = estimatedPublishTime;
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdsExample.java

@@ -0,0 +1,692 @@
+package com.shxy.xymanager_common.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MntnCmdsExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public MntnCmdsExample() {
+        oredCriteria = new ArrayList<>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNull() {
+            addCriterion("term_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIsNotNull() {
+            addCriterion("term_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdEqualTo(Integer value) {
+            addCriterion("term_id =", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotEqualTo(Integer value) {
+            addCriterion("term_id <>", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThan(Integer value) {
+            addCriterion("term_id >", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("term_id >=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThan(Integer value) {
+            addCriterion("term_id <", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdLessThanOrEqualTo(Integer value) {
+            addCriterion("term_id <=", value, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdIn(List<Integer> values) {
+            addCriterion("term_id in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotIn(List<Integer> values) {
+            addCriterion("term_id not in", values, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdBetween(Integer value1, Integer value2) {
+            addCriterion("term_id between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTermIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("term_id not between", value1, value2, "termId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("`name` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("`name` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("`name` =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("`name` <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("`name` >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("`name` >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("`name` <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("`name` <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("`name` like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("`name` not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("`name` in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("`name` not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("`name` between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("`name` not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdIsNull() {
+            addCriterion("cmd is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdIsNotNull() {
+            addCriterion("cmd is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdEqualTo(String value) {
+            addCriterion("cmd =", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdNotEqualTo(String value) {
+            addCriterion("cmd <>", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdGreaterThan(String value) {
+            addCriterion("cmd >", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdGreaterThanOrEqualTo(String value) {
+            addCriterion("cmd >=", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdLessThan(String value) {
+            addCriterion("cmd <", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdLessThanOrEqualTo(String value) {
+            addCriterion("cmd <=", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdLike(String value) {
+            addCriterion("cmd like", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdNotLike(String value) {
+            addCriterion("cmd not like", value, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdIn(List<String> values) {
+            addCriterion("cmd in", values, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdNotIn(List<String> values) {
+            addCriterion("cmd not in", values, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdBetween(String value1, String value2) {
+            addCriterion("cmd between", value1, value2, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andCmdNotBetween(String value1, String value2) {
+            addCriterion("cmd not between", value1, value2, "cmd");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIsNull() {
+            addCriterion("`desc` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIsNotNull() {
+            addCriterion("`desc` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescEqualTo(String value) {
+            addCriterion("`desc` =", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotEqualTo(String value) {
+            addCriterion("`desc` <>", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescGreaterThan(String value) {
+            addCriterion("`desc` >", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescGreaterThanOrEqualTo(String value) {
+            addCriterion("`desc` >=", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLessThan(String value) {
+            addCriterion("`desc` <", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLessThanOrEqualTo(String value) {
+            addCriterion("`desc` <=", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescLike(String value) {
+            addCriterion("`desc` like", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotLike(String value) {
+            addCriterion("`desc` not like", value, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescIn(List<String> values) {
+            addCriterion("`desc` in", values, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotIn(List<String> values) {
+            addCriterion("`desc` not in", values, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescBetween(String value1, String value2) {
+            addCriterion("`desc` between", value1, value2, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andDescNotBetween(String value1, String value2) {
+            addCriterion("`desc` not between", value1, value2, "desc");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mntn_cmds
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnDayStat.java

@@ -0,0 +1,36 @@
+package com.shxy.xymanager_common.entity;
+
+public class MntnDayStat extends MntnDayStatKey {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column mntn_day_stat.uploads
+     *
+     * @mbg.generated
+     */
+    private String uploads;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column mntn_day_stat.uploads
+     *
+     * @return the value of mntn_day_stat.uploads
+     *
+     * @mbg.generated
+     */
+    public String getUploads() {
+        return uploads;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column mntn_day_stat.uploads
+     *
+     * @param uploads the value for mntn_day_stat.uploads
+     *
+     * @mbg.generated
+     */
+    public void setUploads(String uploads) {
+        this.uploads = uploads;
+    }
+}