项目初始化

.gitignore

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

mvnw

@@ -0,0 +1,286 @@
+#!/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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+    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 command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        wget "$jarUrl" -O "$wrapperJarPath"
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        curl -o "$wrapperJarPath" "$jarUrl"
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        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
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,161 @@
+@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 Maven2 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 key stroke 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 my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    echo Found %WRAPPER_JAR%
+) else (
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
+	echo Downloading from: %DOWNLOAD_URL%
+    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+    echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

pom.xml

@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.1.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.taauav</groupId>
+    <artifactId>lishui</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>lishui</name>
+    <description>MSDAMP project for Spring Boot</description>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <!-- mybatis-plus.version -->
+        <mybatis-plus.version>3.2.0</mybatis-plus.version>
+        <!-- swagger.version -->
+        <swagger.version>2.9.2</swagger.version>
+    </properties>
+
+    <dependencies>
+		<!-- 包含 mvc,aop 等jar资源 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+			<!-- 切换log4j2日志读取 -->
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
+        </dependency>		
+		<!-- 配置 log4j2 -->
+		<dependency>
+		   <groupId>org.springframework.boot</groupId>
+		   <artifactId>spring-boot-starter-log4j2</artifactId>
+		</dependency>
+		<!-- 加上这个才能辨认到log4j2.yml文件 -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-yaml</artifactId>
+		</dependency>
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jdbc</artifactId>
+        </dependency>
+        <!-- reids -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+        <!--
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+						
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+		<dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+        </dependency>
+		<dependency>
+            <groupId>org.mybatis.generator</groupId>
+            <artifactId>mybatis-generator-core</artifactId>
+            <version>1.3.7</version>
+        </dependency>
+
+        <!--apache.commons.lang3-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <!--你可以把这个工具看成是java.util的扩展-->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.1</version>
+        </dependency>
+
+        <!--apache.codec:编码方法的工具类包
+        https://blog.csdn.net/u012881904/article/details/52767853-->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+        <!-- 权限管理shiro-->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring</artifactId>
+            <version>1.4.0</version>
+        </dependency>
+        <!-- 权限管理-缓存shiro-redis-->
+        <dependency>
+            <groupId>org.crazycake</groupId>
+            <artifactId>shiro-redis</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+        <!--duid依赖-->
+        <!-- https://mvnrepository.com/artifact/com.alibaba/druid-spring-boot-starter -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.10</version>
+        </dependency>
+        <!--mybatis-plus
+        https://mp.baomidou.com/guide-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
+        <!--mybatis-plus 代码自动生成 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>${mybatis-plus.version}</version>
+        </dependency>
+
+        <!-- freemarker 模板引擎 -->
+        <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.29</version>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 加强版-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>1.9.6</version>
+        </dependency>
+        <!-- 图片压缩 -->
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.8</version>
+        </dependency>
+        <!--Hutool是一个小而全的Java工具类库  https://mvnrepository.com/artifact/cn.hutool/hutool-core -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+            <version>5.0.6</version>
+        </dependency>
+
+        <!--图片gps-->
+        <dependency>
+            <groupId>com.drewnoakes</groupId>
+            <artifactId>metadata-extractor</artifactId>
+            <version>2.6.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.1.7.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.5</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <!-- 本地开发环境 -->
+            <id>local</id>
+            <properties>
+                <package.environment>local</package.environment>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <!--开发测试环境 -->
+            <id>dev</id>
+            <properties>
+                <package.environment>dev</package.environment>
+            </properties>
+        </profile>
+        <profile>
+            <!-- 测试环境 -->
+            <id>test</id>
+            <properties>
+                <package.environment>test</package.environment>
+            </properties>
+        </profile>
+        <profile>
+            <!-- 生产环境 -->
+            <id>prod</id>
+            <properties>
+                <package.environment>prod</package.environment>
+            </properties>
+        </profile>
+    </profiles>
+
+    <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>application-local.yml</exclude>
+                    <exclude>application-dev.yml</exclude>
+                    <exclude>application-test.yml</exclude>
+                    <exclude>application-prod.yml</exclude>
+                </excludes>
+            </resource>
+
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>application-${package.environment}.yml</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <!-- mybatis generator 自动生成代码插件 -->
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+                <version>1.3.1</version>
+                <configuration>
+                    <configurationFile>${basedir}/src/main/resources/generator/generatorConfig.xml</configurationFile>
+                    <overwrite>true</overwrite>
+                    <verbose>true</verbose>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19</version>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

src/main/java/com/taauav/AdminApplication.java

@@ -0,0 +1,22 @@
+package com.taauav;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * @author dyg
+ */
+@SpringBootApplication
+@MapperScan("com.taauav.*.mapper")
+@EnableTransactionManagement
+@EnableScheduling
+public class AdminApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AdminApplication.class, args);
+    }
+
+}

src/main/java/com/taauav/admin/controller/AdminController.java

@@ -0,0 +1,58 @@
+package com.taauav.admin.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.taauav.common.bean.Response;
+import com.taauav.admin.entity.SysAdmin;
+import com.taauav.admin.service.ISysAdminService;
+import com.taauav.admin.service.ISysAuthRuleService;
+import com.taauav.common.util.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author dyg
+ */
+@RestController
+@RequestMapping("/admin")
+public class AdminController extends BaseController {
+    @Autowired
+    private ISysAuthRuleService iSysAuthRuleService;
+    @Autowired
+    private Response response;
+    @Autowired
+    private ISysAdminService adminService;
+
+    /**
+     * 登录用户的信息
+     * @return
+     */
+    @RequestMapping("/info")
+    public Response info() {
+        Integer adminId = ShiroUtils.getAdminId();
+        SysAdmin info = adminService.getAdminInfo(adminId);
+        Map<String,Object> map = new HashMap<String,Object>();
+        List<Map<String,Object>> ruleList = iSysAuthRuleService.getRuleList(info.getId());
+        String permission = iSysAuthRuleService.getPermission(info);
+        map.put("info", info);
+//        map.put("ruleList",ruleList);
+        map.put("permission", permission);
+        return response.success(map);
+    }
+
+    /**
+     * 获取所有菜单
+     * @return
+     */
+    @GetMapping("/authList")
+    public Response authList() {
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("mark", 1);
+        wrapper.eq("status", 1);
+        List<Map<String, Object>> list = iSysAuthRuleService.listMaps(wrapper);
+        return response.success(list);
+    }
+}

src/main/java/com/taauav/admin/controller/BaseController.java

@@ -0,0 +1,8 @@
+package com.taauav.admin.controller;
+
+/**
+ * @author dyg
+ */
+public class BaseController {
+
+}

src/main/java/com/taauav/admin/controller/CtAdController.java

@@ -0,0 +1,20 @@
+package com.taauav.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 广告表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-06
+ */
+@RestController
+@RequestMapping("/admin/ct-ad")
+public class CtAdController {
+
+}

src/main/java/com/taauav/admin/controller/IndexController.java

@@ -0,0 +1,29 @@
+package com.taauav.admin.controller;
+
+import com.taauav.common.bean.Response;
+import com.taauav.admin.service.ISysCityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author daixiantong
+ */
+@RestController
+@RequestMapping("/index")
+public class IndexController {
+    @Autowired
+    private Response response;
+    @Autowired
+    private ISysCityService cityService;
+
+    /**
+     * 首页接口
+     * @return
+     */
+    @GetMapping("/dashboard")
+    public Response index() {
+        return cityService.getCityDriverList(320100);
+    }
+}

src/main/java/com/taauav/admin/controller/StatisticsController.java

@@ -0,0 +1,57 @@
+package com.taauav.admin.controller;
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.service.IStatisticsService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>数据统计</p>
+ *
+ * @author : dyg
+ * @date : 2019-12-05 16:22
+ **/
+@RestController
+@RequestMapping("statistics")
+public class StatisticsController {
+    @Autowired
+    private IStatisticsService iStatisticsService;
+
+
+    /**
+     * 报告统计
+     * @param map
+     * @return
+     */
+    @PostMapping("index")
+    @RequiresPermissions("statistics:" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String,String> map) {
+        return iStatisticsService.getStatisticsDataIndex(map);
+    }
+
+    /**
+     * 获取区域河道列表
+     * @param map
+     * @return
+     */
+    @PostMapping("area")
+    @RequiresPermissions("statistics:area")
+    public Response area(@RequestBody(required = false) Map<String,String> map) {
+        return iStatisticsService.getAreaStaticsData(map);
+    }
+
+    /**
+     * 根据报告编号获取数据
+     * @param reportId
+     * @return
+     */
+    @GetMapping("reportInfo")
+    @RequiresPermissions("statistics:reportInfo")
+    public Response getInfoByReportId(@RequestParam("reportId") Integer reportId,String fileDocument) {
+        return iStatisticsService.getInfoByReportId(reportId,fileDocument);
+    }
+}

src/main/java/com/taauav/admin/controller/StatisticsMapController.java

@@ -0,0 +1,55 @@
+package com.taauav.admin.controller;
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.service.IStatisticsMapService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>地图统计数据</p>
+ *
+ * @author : dyg
+ * @date : 2019-12-07 14:00
+ **/
+@RequestMapping("statisticsMap")
+@RestController
+public class StatisticsMapController {
+    @Autowired
+    private IStatisticsMapService iStatisticsMapService;
+
+    /**
+     * 获取所有区域数据
+     * @return
+     */
+    @GetMapping("index")
+    @RequiresPermissions("statisticsMap:"+ PermissionConstants.LIST_PERMISSION)
+    public Response index() {
+        return iStatisticsMapService.getIndexData();
+    }
+
+    /**
+     * 根据区域编号获取所有河道数据
+     * @param driverArea
+     * @return
+     */
+    @GetMapping("driverArea")
+    @RequiresPermissions("statisticsMap:driverArea")
+    public Response area(Integer driverArea,Integer type) {
+        return iStatisticsMapService.getDriversByDriverArea(driverArea, type);
+    }
+
+    /**
+     * 根据河道编号获取图片数据
+     * @param inspectDriverId
+     * @return
+     */
+    @GetMapping("fileList")
+    @RequiresPermissions("statisticsMap:fileList")
+    public Response fileList(Integer inspectDriverId, Integer type) {
+        return iStatisticsMapService.getFileListByInspectDriverId(inspectDriverId, type);
+    }
+}

src/main/java/com/taauav/admin/controller/SysAdminController.java

@@ -0,0 +1,174 @@
+package com.taauav.admin.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.SysAdmin;
+import com.taauav.admin.service.ISysAdminService;
+import com.taauav.admin.service.ISysCityService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 管理员表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+@RestController
+@RequestMapping("/admin")
+public class
+SysAdminController {
+    @Autowired
+    private ISysAdminService iSysAdminService;
+    @Autowired
+    private Response response;
+    @Autowired
+    private ISysCityService cityService;
+
+    private static final String controllerName = "admin";
+
+    /**
+     * 管理员列表接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String, String> map) {
+        return iSysAdminService.findAdminPageList(map);
+    }
+
+    /**
+     * 编辑-提交接口
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody @Valid SysAdmin map, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iSysAdminService.editAdminInfo(map);
+    }
+
+    /**
+     * 编辑-获取原数据接口
+     * @param id
+     * @return
+     */
+    @GetMapping("/getAdminInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getAdminInfo(Integer id) {
+        SysAdmin admin = iSysAdminService.getAdminInfo(id);
+        if (admin == null) {
+            return response.failure("操作失败", null);
+        }
+        return response.success("操作成功", admin);
+    }
+
+    /**
+     * 添加管理员
+     * @param map
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody @Valid SysAdmin map, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iSysAdminService.editAdminInfo(map);
+    }
+
+    /**
+     * 删除管理员账号
+     * @param map
+     * @return
+     */
+    @PostMapping("/drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response dropAdmin(@RequestBody Map<String, String> map) {
+        map.put("act", "drop");
+        return iSysAdminService.dealAdmin(map);
+    }
+
+    /**
+     * 重置密码接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/reset")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.PASSWORD_PERMISSION)
+    public Response resetPassword(@RequestBody Map<String, String> map) {
+        map.put("act", "reset");
+        return iSysAdminService.dealAdmin(map);
+    }
+
+    /**
+     * 修改账户状态接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/editStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response editStatus(@RequestBody Map<String, String> map) {
+        map.put("act", "changeStatus");
+        return iSysAdminService.dealAdmin(map);
+    }
+
+    /**
+     * 设置账户权限接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/setPermit")
+    @RequiresPermissions("admin:setPermit")
+    public Response setPermit(@RequestBody (required = false) Map<String,String> map) {
+        return iSysAdminService.setPermit(map);
+    }
+
+    /**
+     * 获取所有管理员（组装option用）
+     * @return
+     */
+    @PostMapping("/getAdminList")
+    public Response getAdminList() {
+        return iSysAdminService.getAdminList();
+    }
+
+    /**
+     * 获取角色数组
+     * @return
+     */
+    @PostMapping("/authList")
+    public Response getAuthGroupList() {
+        return iSysAdminService.getAuthGroupList();
+    }
+
+    /**
+     * 获取城市数组
+     * @return
+     */
+    @GetMapping("/getCityList")
+    public Response getCityList() {
+        //区属权限
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("mark", 1);
+        wrapper.eq("pid", 320100);
+        wrapper.select("id,name");
+        List<Map<String, Object>> cityList = cityService.listMaps(wrapper);
+        return response.success("操作成功", cityList);
+    }
+}

src/main/java/com/taauav/admin/controller/SysAuthGroupAccessController.java

@@ -0,0 +1,20 @@
+package com.taauav.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 用户组明细表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+@RestController
+@RequestMapping("/admin/sys-auth-group-access")
+public class SysAuthGroupAccessController {
+
+}

src/main/java/com/taauav/admin/controller/SysAuthGroupController.java

@@ -0,0 +1,141 @@
+package com.taauav.admin.controller;
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.SysAuthGroup;
+import com.taauav.admin.service.ISysAuthGroupService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户组表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+@RestController
+@RequestMapping("/authgroup")
+public class SysAuthGroupController {
+    @Autowired
+    private ISysAuthGroupService iSysAuthGroupService;
+    @Autowired
+    private Response response;
+
+    private static final String controllerName = "authgroup";
+
+    /**
+     * 角色列表
+     * @param map
+     * @return
+     */
+    @GetMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String,String> map) {
+        return iSysAuthGroupService.getList(map);
+    }
+
+    /**
+     * 修改角色
+     * @param authGroup
+     * @return
+     */
+    @PostMapping("/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody(required = false) @Valid SysAuthGroup authGroup, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iSysAuthGroupService.edit(authGroup);
+    }
+
+    /**
+     * 获取角色数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getAuthGroup")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getAuthGroup(Integer id) {
+        if (id <= 0) {
+            response.failure("数据不存在");
+        }
+        Map<String,Object> map = new HashMap<>();
+        SysAuthGroup info = iSysAuthGroupService.getInfoById(id);
+        if (StringUtils.isEmpty(info)) {
+            return response.failure("数据不存在");
+        }
+        map.put("id", info.getId());
+        map.put("name",info.getName());
+        map.put("pid",info.getPid());
+        map.put("has_child",info.getHasChild());
+        map.put("remark",info.getRemark());
+        map.put("sort",info.getSort());
+        List<Map<String,String>> pList ;
+        if (info.getPid() > 0) {
+            pList = iSysAuthGroupService.getListByPid(0);
+        } else {
+            pList = null;
+        }
+        map.put("p_list",pList);
+        return response.success(map);
+    }
+
+    /**
+     * 添加角色
+     * @param authGroup
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody @Valid SysAuthGroup authGroup,BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iSysAuthGroupService.add(authGroup);
+    }
+
+    /**
+     * 删除角色
+     * @param authGroup
+     * @return
+     */
+    @PostMapping("/del")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response del(@RequestBody SysAuthGroup authGroup) {
+        return iSysAuthGroupService.del(authGroup);
+    }
+
+    /**
+     * 设置权限
+     * @param map
+     * @return
+     */
+    @PostMapping("/setRules")
+    @RequiresPermissions("authgroup:setRules")
+    public Response setRules(@RequestBody Map<String,String> map) {
+        return iSysAuthGroupService.setRules(map);
+    }
+
+    /**
+     * 后台角色设置状态
+     * @param map
+     * @return
+     */
+    @PostMapping("/editStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response editStatus(@RequestBody Map<String,String> map) {
+        return iSysAuthGroupService.editStatus(map);
+    }
+}

src/main/java/com/taauav/admin/controller/SysAuthRuleController.java

@@ -0,0 +1,121 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Menu;
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.SysAuthRule;
+import com.taauav.admin.service.ISysAuthRuleService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 权限规则表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+@RestController
+@RequestMapping("/authrule")
+public class SysAuthRuleController {
+    @Autowired
+    private ISysAuthRuleService iSysAuthRuleService;
+    @Autowired
+    private Response response;
+
+    private static final String controllerName = "authrule";
+
+    /**
+     * 后台菜单-列表页面
+     * @return
+     */
+    @GetMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String,String> request) {
+        return iSysAuthRuleService.getRulePageList(request);
+    }
+
+    /**
+     * 后台菜单-编辑页面
+     * @return
+     */
+    @RequestMapping("/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody @Valid SysAuthRule authRule, BindingResult bindingResult){
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iSysAuthRuleService.editRule(authRule);
+    }
+
+    /**
+     * 后台菜单-获取编辑数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getAuthInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getAuthInfo(Integer id) {
+        Map<String,Object> map = new HashMap<>(12);
+        SysAuthRule info =  iSysAuthRuleService.getInfoById(id);
+        List<Menu> menuList = iSysAuthRuleService.buildTreeMenu();
+        map.put("title",info.getTitle());
+        map.put("name",info.getName());
+        map.put("icon",info.getIcon());
+        map.put("remark",info.getRemark());
+        map.put("sort",info.getSort());
+        map.put("hasChild",info.getHasChild());
+        map.put("type",info.getType());
+        map.put("status",info.getStatus());
+        map.put("permission",info.getPermission());
+        map.put("id",info.getId());
+        map.put("pid",info.getPid());
+        map.put("menuList",menuList);
+        return response.success(map);
+    }
+
+    /**
+     * 后台菜单-添加页面
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody @Valid SysAuthRule authRule,BindingResult bindingResult){
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iSysAuthRuleService.addRule(authRule);
+    }
+
+    /**
+     * 后台菜单-删除页面
+     * @return
+     */
+    @PostMapping("/del")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response del(@RequestBody SysAuthRule authRule) {
+        return iSysAuthRuleService.delRule(authRule);
+    }
+
+    /**
+     * 后台菜单设置状态
+     * @param map
+     * @return
+     */
+    @PostMapping("/editStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response editStatus(@RequestBody Map<String,String> map) {
+        return iSysAuthRuleService.editStatus(map);
+    }
+}

src/main/java/com/taauav/admin/controller/SysCityController.java

@@ -0,0 +1,20 @@
+package com.taauav.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 城市表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-13
+ */
+@RestController
+@RequestMapping("/admin/sys-city")
+public class SysCityController {
+
+}

src/main/java/com/taauav/admin/controller/SysConfigController.java

@@ -0,0 +1,115 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.SysConfig;
+import com.taauav.admin.mapper.SysConfigMapper;
+import com.taauav.admin.service.ISysConfigService;
+import com.taauav.common.util.FunctionUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 系统配置表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-12
+ */
+@RestController
+@RequestMapping("/config")
+public class SysConfigController {
+    @Autowired
+    private ISysConfigService configService;
+    @Autowired
+    private Response response;
+    @Autowired
+    private SysConfigMapper configMapper;
+
+    private static final String controllerName = "config";
+
+    /**
+     * 列表数据接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String, String> map) {
+        return configService.getPageList(map);
+    }
+
+    /**
+     * 编辑-提交保存接口
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody SysConfig map) {
+        return configService.editData(map);
+    }
+
+    /**
+     * 编辑-获取原数据接口
+     * @param id
+     * @return
+     */
+    @GetMapping("/getConfigInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getConfigInfo(Integer id) {
+        SysConfig configInfo = configService.getConfigById(id);
+        return response.success("操作成功", configInfo);
+    }
+
+    /**
+     * 新增配置接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody SysConfig map) {
+        return configService.editData(map);
+    }
+
+    /**
+     * 删除配置接口
+     * @param id
+     * @return
+     */
+    @PostMapping("/drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response drop(@RequestBody(required = false) Map<String, String> map) {
+        if (map == null) {
+            return response.failure("参数不能为空");
+        }
+        String id = "id";
+        if (FunctionUtils.isEmpty(id, map) || !FunctionUtils.isNumeric(map.get(id)) || Integer.valueOf(map.get(id)) <= 0) {
+            return response.failure("配置id不合法");
+        }
+        SysConfig config = configService.getConfigById(Integer.valueOf(map.get(id)));
+        if (config == null) {
+            return response.failure("配置信息不存在");
+        }
+        config.setMark(Byte.valueOf("0"));
+        configMapper.updateById(config);
+        return response.success("操作成功");
+    }
+
+    /**
+     * 设置配置状态接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/setStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response setStatus(@RequestBody Map<String, Integer> map) {
+        return configService.setStatus(map);
+    }
+}

src/main/java/com/taauav/admin/controller/SysDepController.java

@@ -0,0 +1,84 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.SysDep;
+import com.taauav.admin.service.ISysDepService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 部门管理表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-07
+ */
+@RestController
+@RequestMapping("/dep")
+public class SysDepController {
+    @Autowired
+    private ISysDepService iSysDepService;
+
+    private static final String controllerName = "dep";
+
+    /**
+     * 部门列表
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index() {
+        return iSysDepService.index();
+    }
+
+
+    /**
+     * 编辑部门
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "/edit", method = {RequestMethod.POST, RequestMethod.GET})
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody(required = false) SysDep map) {
+        return iSysDepService.edit(map);
+    }
+
+    /**
+     * 获取部门数据信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/getDepInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getDepInfo(Integer id) {
+        return iSysDepService.getDepInfo(id);
+    }
+
+    /**
+     * 添加部门
+     * @param map
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody(required = true) SysDep map) {
+        return iSysDepService.edit(map);
+    }
+
+    /**
+     * 删除
+     * @param map
+     * @return
+     */
+    @PostMapping("/drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response drop(@RequestBody(required = true) Map<String, String> map) {
+        return iSysDepService.drop(map);
+    }
+}

src/main/java/com/taauav/admin/controller/SysDictController.java

@@ -0,0 +1,195 @@
+package com.taauav.admin.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.SysDict;
+import com.taauav.admin.mapper.SysDictMapper;
+import com.taauav.admin.service.ISysAdminService;
+import com.taauav.admin.service.ISysDictService;
+import com.taauav.common.util.FunctionUtils;
+import com.taauav.common.util.ShiroUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 系统字典表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@RestController
+@RequestMapping("/dict")
+public class SysDictController {
+    @Autowired
+    private ISysDictService dictService;
+    @Autowired
+    private Response response;
+    @Autowired
+    private SysDictMapper dictMapper;
+    @Autowired
+    private ISysAdminService adminService;
+
+    private static final String controllerName = "dict";
+
+    /**
+     * 数据字典列表接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String, String> map) {
+        return dictService.getPageList(map);
+    }
+
+    /**
+     * 编辑-提交接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody SysDict map) {
+        return dictService.editData(map);
+    }
+
+    /**
+     * 编辑-获取原数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getDictInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getDictInfo(Integer id) {
+        if (id <= 0) {
+            return response.failure("数据字典id不合法");
+        }
+        SysDict dict = dictService.getDictById(id);
+        if (dict == null) {
+            return response.failure("对应数据字典数据不存在");
+        }
+        return response.success("操作成功", dict);
+    }
+
+    /**
+     * 新增数据字典接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody SysDict map) {
+        return dictService.editData(map);
+    }
+
+    /**
+     * 删除数据字典接口
+     * @param id
+     * @return
+     */
+    @PostMapping("/drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response drop(@RequestBody Integer id) {
+        if (id <= 0) {
+            return response.failure("数据字典id不合法");
+        }
+        SysDict dict = dictService.getDictById(id);
+        if (dict == null) {
+            return response.failure("对应数据不存在");
+        }
+        dict.setMark(Byte.valueOf("0"));
+        dict.setUpdateTime(FunctionUtils.now());
+        dict.setUpdateUser(ShiroUtils.getAdminId());
+        dictMapper.updateById(dict);
+        return response.success("操作成功");
+    }
+
+    /**
+     * 根据id获取子级数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getChildList")
+    public Response getChildByPid(Integer id) {
+        if (id <= 0) {
+            return response.failure("对应数据不存在");
+        }
+        SysDict info = dictMapper.selectById(id);
+        if (info == null) {
+            return response.failure("对应数据不存在");
+        }
+        if (info.getHasChild() == 1) {
+            QueryWrapper wrapper = new QueryWrapper();
+            wrapper.eq("mark", 1);
+            wrapper.eq("pid", id);
+            List<Map<String, Object>> list = dictMapper.selectMaps(wrapper);
+            if (list != null) {
+                for (Map<String, Object> val : list) {
+                    Integer createUser = new Long(val.get("create_user").toString()).intValue();
+                    val.put("createUserName", adminService.getRealNameById(createUser));
+                    Integer createTime = new Long(val.get("create_time").toString()).intValue();
+                    val.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss"));
+                }
+            }
+            return response.success("操作成功", list);
+        } else {
+            return response.failure("无对应子级数据");
+        }
+    }
+
+    @GetMapping("/pDictList")
+    public Response getParentDictList() {
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("mark", 1);
+        wrapper.eq("has_child", 1);
+        wrapper.eq("status", 1);
+        wrapper.eq("pid", 0);
+        List<SysDict> list = dictService.list(wrapper);
+        List<Map<String, Object>> dictList = new ArrayList<>();
+        if (list != null) {
+            list.forEach (item -> {
+                Map<String, Object> fMap = new HashMap<>();
+                fMap.put("id", item.getId());
+                fMap.put("name", item.getName());
+                fMap.put("pid", item.getPid());
+                QueryWrapper wrp = new QueryWrapper();
+                wrp.eq("pid", item.getId());
+                wrp.eq("mark", 1);
+                wrp.eq("status", 1);
+                wrp.eq("has_child", 1);
+                List<SysDict> childList = dictService.list(wrp);
+                List<Map<String, Object>> fChild = new ArrayList<>();
+                if (childList != null) {
+                    childList.forEach (val -> {
+                        Map<String, Object> map = new HashMap<>();
+                        map.put("id", val.getId());
+                        map.put("name", val.getName());
+                        map.put("pid", val.getPid());
+                        QueryWrapper cond = new QueryWrapper();
+                        cond.eq("pid", val.getId());
+                        cond.eq("mark", 1);
+                        cond.eq("status", 1);
+                        cond.eq("has_child", 1);
+                        List<Map<String, Object>> cList = dictMapper.selectList(cond);
+                        map.put("children", cList);
+                        fChild.add(map);
+                    });
+                }
+                fMap.put("children", fChild);
+                dictList.add(fMap);
+            });
+        }
+
+        return response.success("操作成功", dictList);
+    }
+}

src/main/java/com/taauav/admin/controller/SysDictTypeController.java

@@ -0,0 +1,119 @@
+package com.taauav.admin.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.SysDictType;
+import com.taauav.admin.mapper.SysDictTypeMapper;
+import com.taauav.admin.service.ISysDictTypeService;
+import com.taauav.common.util.FunctionUtils;
+import com.taauav.common.util.ShiroUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 系统字典分类表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@RestController
+@RequestMapping("/dicttype")
+public class SysDictTypeController {
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+    @Autowired
+    private SysDictTypeMapper dictTypeMapper;
+    @Autowired
+    private Response response;
+
+    private static final String controllerName = "dicttype";
+
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String, String> map) {
+        return dictTypeService.getPageList(map);
+    }
+
+    /**
+     * 编辑-提交接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody SysDictType map) {
+        return dictTypeService.editData(map);
+    }
+
+    /**
+     * 编辑-获取原数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getEditInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getEditInfo(Integer id) {
+        if (id <= 0) {
+            return response.failure("分类id不合法");
+        }
+        SysDictType dictType = dictTypeService.getDictTypeById(id);
+        if (dictType == null) {
+            return response.failure("对应分类数据不存在");
+        }
+        return response.success("操作成功", dictType);
+    }
+
+    /**
+     * 新增分类接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody SysDictType map) {
+        return dictTypeService.editData(map);
+    }
+
+    /**
+     * 删除分类接口
+     * @param id
+     * @return
+     */
+    @PostMapping("/drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response drop(@RequestBody Integer id) {
+        if (id <= 0) {
+            return response.failure("字典分类id不合法");
+        }
+        SysDictType dictType = dictTypeService.getDictTypeById(id);
+        if (dictType == null) {
+            return response.failure("字典分类信息不存在");
+        }
+        dictType.setMark(Byte.valueOf("0"));
+        dictType.setUpdateTime(FunctionUtils.now());
+        dictType.setUpdateUser(ShiroUtils.getAdminId());
+        dictTypeMapper.updateById(dictType);
+        return response.success("操作成功");
+    }
+
+    /**
+     * 获取字典分类全部数据
+     * @return
+     */
+    @GetMapping("/dictTypeList")
+    public Response getDictTypeList() {
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("mark", 1);
+        wrapper.orderByAsc("sort", "id");
+        List<Map<String, Object>> list = dictTypeMapper.selectList(wrapper);
+        return response.success("操作成功", list);
+    }
+}

src/main/java/com/taauav/admin/controller/SysLevelController.java

@@ -0,0 +1,117 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.common.constant.SysLevelConstant;
+import com.taauav.admin.entity.SysLevel;
+import com.taauav.admin.service.ISysLevelService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * 职级管理表 前端控制器
+ * </p>
+ *
+ * @author daixt
+ * @since 2019-11-11
+ */
+@RestController
+@RequestMapping("/level")
+public class SysLevelController {
+    @Autowired
+    private ISysLevelService levelService;
+    @Resource
+    private Response response;
+
+    private static final String controllerName = "level";
+
+    /**
+     * 职级列表接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody Map<String, String> map) {
+        return levelService.pageList(map);
+    }
+
+    /**
+     * 编辑-提交接口
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody(required = false) SysLevel map) {
+        return levelService.edit(map);
+    }
+
+    /**
+     * 编辑-获取原数据接口
+     * @param id
+     * @return
+     */
+    @GetMapping("/getLevelInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getLevelInfo(Integer id) {
+        if (id <= 0) {
+            return response.failure("职级id必须为正整数");
+        }
+        return levelService.getLevelInfo(id);
+    }
+
+    /**
+     * 添加职级接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody(required = true) SysLevel map) {
+        return levelService.edit(map);
+    }
+
+    /**
+     * 删除职级接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response drop(@RequestBody(required = true) SysLevel map) {
+        if (map.getId() == null || map.getId() <= 0) {
+            return response.failure("职级id必须为正整数");
+        }
+        return levelService.drop(map.getId());
+    }
+
+    /**
+     * 修改职级状态接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/changeStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response changeStatus(@RequestBody(required = true) SysLevel map) {
+        if (map.getId() == null || map.getId() <= 0) {
+            return response.failure("职级id必须为正整数");
+        }
+        return levelService.changeStatus(map.getId(), map.getStatus());
+    }
+
+    /**
+     * 获取职级状态
+     * @return
+     */
+    @PostMapping("/getStatus")
+    public Response getStatus() {
+        return response.success("操作成功", SysLevelConstant.getLevelStatus());
+    }
+}

src/main/java/com/taauav/admin/controller/SysPositionController.java

@@ -0,0 +1,111 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.common.constant.SysPositionConstant;
+import com.taauav.admin.entity.SysPosition;
+import com.taauav.admin.service.ISysPositionService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * <p>
+ * 职位表 前端控制器
+ * </p>
+ *
+ * @author daixt
+ * @since 2019-11-12
+ */
+@RestController
+@RequestMapping("/position")
+public class SysPositionController {
+    @Autowired
+    private ISysPositionService positionService;
+    @Resource
+    private Response response;
+
+    private static final String controllerName = "position";
+
+    /**
+     * 岗位列表接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String, String> map) {
+        return positionService.index(map);
+    }
+
+    /**
+     * 编辑-提交接口
+     * @param map
+     * @return
+     */
+    @PostMapping(value = "/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody SysPosition map) {
+        return positionService.edit(map);
+    }
+
+    /**
+     * 编辑-获取数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getPositionInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getPositionInfo(Integer id) {
+        if (id < 1) {
+            return response.failure("岗位id必须为正整数");
+        }
+        return positionService.getPositionInfo(id);
+    }
+
+    /**
+     * 添加岗位接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody SysPosition map) {
+        return positionService.edit(map);
+    }
+
+    /**
+     * 删除岗位接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response drop(@RequestBody SysPosition map) {
+        return positionService.drop(map.getId());
+    }
+
+    /**
+     * 修改岗位状态
+     * @param map
+     * @return
+     */
+    @PostMapping("/changeStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response changeStatus(@RequestBody SysPosition map) {
+        return positionService.changeStatus(map.getId(), map.getStatus());
+    }
+
+    /**
+     * 获取岗位状态
+     * @return
+     */
+    @PostMapping("/getStatus")
+    public Response getStatus() {
+        return response.success("操作成功", SysPositionConstant.getPositionStatus());
+    }
+}

src/main/java/com/taauav/admin/controller/TauvDriverController.java

@@ -0,0 +1,129 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.TauvDriver;
+import com.taauav.admin.service.ITauvDriverService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * <p>
+ * 河道管理表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-12
+ */
+@RestController
+@RequestMapping("/driver")
+public class TauvDriverController {
+    @Autowired
+    private Response response;
+    @Autowired
+    private ITauvDriverService iTauvDriverService;
+
+    private static final String controllerName = "driver";
+
+    /**
+     * 河道列表
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String, String> map) {
+        return iTauvDriverService.getPageList(map);
+    }
+
+    /**
+     * 修改河道数据
+     * @param driver
+     * @return
+     */
+    @PostMapping("/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody @Valid TauvDriver driver,BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvDriverService.edit(driver);
+    }
+
+    /**
+     * 获取河道数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getDriverInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getDriverInfo(Integer id) {
+        TauvDriver info = iTauvDriverService.getInfoById(id);
+        if (StringUtils.isEmpty(info)) {
+            return response.failure("数据不存在");
+        }
+        return response.success(iTauvDriverService.getInfoDetail(info));
+    }
+
+    /**
+     * 添加河道数据
+     * @param driver
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody @Valid TauvDriver driver, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvDriverService.add(driver);
+    }
+
+    /**
+     * 查看河道详细数据
+     * @param map
+     * @return
+     */
+    @GetMapping("/detail")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.VIEW_PERMISSION)
+    public Response detail(@RequestParam Map<String,String> map) {
+        if (StringUtils.isEmpty(map)) {
+            return response.failure("数据不存在");
+        }
+        if (!map.containsKey("id")) {
+            return response.failure("参数不存");
+        }
+        Integer id = Integer.valueOf(map.get("id"));
+        TauvDriver info = iTauvDriverService.getInfoById(id);
+        if (StringUtils.isEmpty(info)) {
+            return response.failure("数据不存在");
+        }
+        return response.success(iTauvDriverService.getInfoDetail(info));
+    }
+
+    /**
+     * 基础数据
+     * @return
+     */
+    @GetMapping("/baseData")
+    public Response getBaseData() {
+        return response.success(iTauvDriverService.getBaseData());
+    }
+
+    /**
+     * 获取所有河道数据
+     * @return
+     */
+    @GetMapping("/driverList")
+    public Response getDriverList() {
+        return iTauvDriverService.getDriverList();
+    }
+}

src/main/java/com/taauav/admin/controller/TauvEquipmentController.java

@@ -0,0 +1,115 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.TauvEquipment;
+import com.taauav.admin.service.ITauvEquipmentService;
+import com.taauav.common.util.FunctionUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * <p>
+ * 设备管理表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-13
+ */
+@RestController
+@RequestMapping("/equipment")
+public class TauvEquipmentController {
+    @Autowired
+    private ITauvEquipmentService iTauvEquipmentService;
+    @Autowired
+    private Response response;
+
+    private static final String controllerName = "equipment";
+
+    /**
+     * 设备列表
+     * @param map
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String,String> map) {
+        return iTauvEquipmentService.getPageList(map);
+    }
+
+    /**
+     * 设备编辑
+     * @param tauvEquipment
+     * @return
+     */
+    @PostMapping(value = "/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody @Valid TauvEquipment tauvEquipment,BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvEquipmentService.edit(tauvEquipment);
+    }
+
+    /**
+     * 获取设备信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/getEquipmentInfo")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getEquipmentInfo(Integer id) {
+        TauvEquipment equipment = iTauvEquipmentService.getInfoById(id);
+        if (StringUtils.isEmpty(equipment)) {
+            return response.failure("数据不存在");
+        }
+        Map<String,Object> info = FunctionUtils.transBean2Map(equipment);
+        info.put("format_register_time",FunctionUtils.formatTime(equipment.getRegisterTime(),"yyyy-MM-dd HH:mm:ss"));
+        info.put("typeList",equipment.getTypeList());
+        info.put("statusList",equipment.getStatusList());
+        return response.success(info);
+    }
+
+    /**
+     * 设备添加
+     * @param tauvEquipment
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody @Valid TauvEquipment tauvEquipment, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvEquipmentService.add(tauvEquipment);
+    }
+
+    /**
+     * 设置状态
+     * @param map
+     * @return
+     */
+    @PostMapping("/setStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response setStatus(@RequestBody Map<String,String> map) {
+        return iTauvEquipmentService.setRules(map);
+    }
+
+    /**
+     * 基础数据
+     * @return
+     */
+    @GetMapping("/baseData")
+    public Response getBaseData() {
+        return response.success(iTauvEquipmentService.getBaseData());
+    }
+}

src/main/java/com/taauav/admin/controller/TauvInspectController.java

@@ -0,0 +1,51 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.TauvInspect;
+import com.taauav.admin.service.ITauvInspectService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.FieldError;
+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.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 巡检任务表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@RestController
+@RequestMapping("/inspect")
+public class TauvInspectController {
+
+    @Autowired
+    private ITauvInspectService iTauvInspectService;
+    @Autowired
+    private Response response;
+
+    private static final String controllerName = "inspect";
+
+    @PostMapping("/addTask")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response addTask(@RequestBody @Valid TauvInspect inspect , BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            List<FieldError> errorList = bindingResult.getFieldErrors();
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvInspectService.addTask(inspect);
+    }
+
+}

src/main/java/com/taauav/admin/controller/TauvInspectDriverController.java

@@ -0,0 +1,212 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.TauvInspect;
+import com.taauav.admin.service.ISysAdminService;
+import com.taauav.admin.service.ISysAuthGroupService;
+import com.taauav.admin.service.ISysCityService;
+import com.taauav.admin.service.ITauvInspectDriverService;
+import com.taauav.admin.validate.ExecuteTask;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 巡检任务河道表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@RestController
+@RequestMapping("/inspectDriver")
+public class TauvInspectDriverController {
+    @Autowired
+    private ITauvInspectDriverService iTauvInspectDriverService;
+    @Autowired
+    private Response response;
+    @Autowired
+    private ISysCityService cityService;
+    @Autowired
+    private ISysAdminService adminService;
+    @Autowired
+    private ISysAuthGroupService authGroupService;
+
+    private static final String controllerName = "inspectDriver";
+
+    /**
+     * 任务列表--未分配
+     * @param map
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String, Object> map) {
+        Byte[] st = new Byte[]{1};
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        map.put("status", st);
+        return iTauvInspectDriverService.getPageList(map, "assign");
+    }
+
+    /**
+     * 任务列表--已分配
+     * @param map
+     * @return
+     */
+    @PostMapping("/assignedList")
+    @RequiresPermissions(controllerName + ":assignedList")
+    public Response assignedList(@RequestBody(required = false) Map<String, Object> map) {
+        Byte[] st = new Byte[]{2,3,4,5,6};
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        String status = "status";
+        if (map.containsKey(status) && !"".equals(map.get(status))) {
+            map.put("status", new Byte[]{Byte.valueOf(map.get(status).toString())});
+        } else {
+            map.put("status", st);
+        }
+        return iTauvInspectDriverService.getPageList(map, "assign");
+    }
+
+    /**
+     * 任务列表
+     * @param map
+     * @return
+     */
+    @PostMapping("/list")
+    @RequiresPermissions(controllerName + ":list")
+    public Response taskList(@RequestBody(required = false) Map<String,Object> map) {
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        String status = "status";
+        if (map.containsKey(status) && !"".equals(map.get(status))) {
+            map.put("status", new Byte[]{Byte.valueOf(map.get(status).toString())});
+        } else {
+            map.put("status", new Byte[]{2,3,4,5,6});
+        }
+        return iTauvInspectDriverService.getPageList(map, "list");
+    }
+
+    /**
+     * 分配任务
+     * @param map
+     * @return
+     */
+    @RequestMapping("/assignTask")
+    @RequiresPermissions(controllerName + ":assign")
+    public Response assignTask(@RequestBody Map<String,String> map) {
+        return iTauvInspectDriverService.assignTask(map);
+    }
+
+    /**
+     * 任务详情
+     */
+    @GetMapping("/detail")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.VIEW_PERMISSION)
+    public Response detail(@RequestBody @RequestParam("id") Integer id) {
+        Map<String,Object> info =  iTauvInspectDriverService.detail(id);
+        if (StringUtils.isEmpty(info.get("error"))) {
+            return response.success(info);
+        } else {
+            return response.failure(info.get("error"));
+        }
+    }
+
+    /**
+     * 取消任务
+     * @param map
+     * @return
+     */
+    @PostMapping("/cancel")
+    @RequiresPermissions(controllerName + ":cancel")
+    public Response cancel(@RequestBody Map<String,String> map) {
+        return iTauvInspectDriverService.cancel(map);
+    }
+
+    /**
+     * 执行任务
+     * @return
+     */
+    @PostMapping("/executeTask")
+    @RequiresPermissions(controllerName + ":execute")
+    public Response executeTask(@RequestBody @Valid ExecuteTask executeTask) {
+        return iTauvInspectDriverService.executeTask(executeTask);
+    }
+
+    /**
+     * 获取打印的数据信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/print")
+    @RequiresPermissions(controllerName + ":print")
+    public Response print(@RequestBody @RequestParam("id") Integer id) {
+        return iTauvInspectDriverService.getPrintData(id);
+    }
+
+    /**
+     * 获取基础数据
+     * @return
+     */
+    @GetMapping("/basicData")
+    public Response basicData() {
+        Map<String, Object> result = new HashMap<>(4);
+        TauvInspect tauvInspect = new TauvInspect();
+        //状态数组
+        result.put("statusList", tauvInspect.getStatusList());
+        //分类数组
+        result.put("typeList",tauvInspect.getTypeList());
+        //区域数组
+        result.put("areaList",cityService.getCityListByPidAndAdmin(320100));
+        //飞行小组
+        result.put("adminList",adminService.getAdminListByGroupId(6));
+        return response.success("操作成功", result);
+    }
+
+    /**
+     * 判断是否已生成报告
+     * @param map
+     * @return
+     */
+    @PostMapping("/existReport")
+    public Response existReport(@RequestBody Map<String, Object> map) {
+        if (StringUtils.isEmpty(map)) {
+            return response.failure("参数不能为空");
+        }
+        return iTauvInspectDriverService.existReport(map);
+    }
+
+    /**
+     * 删除任务
+     * @param map
+     * @return
+     */
+    @PostMapping("/dropTask")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response dropTask(@RequestBody Map<String, Object> map) {
+        return iTauvInspectDriverService.dropTask(map);
+    }
+
+    /**
+     * 重处理任务
+     * @param map
+     * @return
+     */
+    @PostMapping("/reProcess")
+    @RequiresPermissions(controllerName + ":reProcess")
+    public Response reProcess(@RequestBody Map<String, Object> map) {
+        return iTauvInspectDriverService.reProcess(map);
+    }
+}

src/main/java/com/taauav/admin/controller/TauvInspectFileController.java

@@ -0,0 +1,273 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.TauvInspectFile;
+import com.taauav.admin.entity.TauvQuestionOptions;
+import com.taauav.admin.service.ITauvInspectFileService;
+import com.taauav.admin.service.ITauvQuestionOptionsService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 巡检附件表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@RestController
+@RequestMapping("inspectfile")
+@Slf4j
+public class TauvInspectFileController {
+    @Autowired
+    private ITauvInspectFileService inspectFileService;
+
+    @Value("${file.uploadFolder}")
+    private String uploadFolder;
+    @Value("${server.UPLOAD_URL}")
+    private String uploadUrl;
+    @Autowired
+    private Response response;
+    @Autowired
+    private ITauvQuestionOptionsService questionService;
+    private static final String controllerName = "inspectfile";
+
+    /**
+     * 图片列表
+     * @param map
+     * @return
+     */
+    @PostMapping("picList")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response picList(@RequestBody Map<String,Object> map) {
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        if (StringUtils.isEmpty(map.get("status"))) {
+            map.put("status", "3,4,5,6");
+        }
+        return inspectFileService.getPageList(map, "pic");
+    }
+
+    /**
+     * 图片上传
+     * @param map
+     * @return
+     */
+    @PostMapping("uploadPic")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.UPLOAD_PERMISSION)
+    public Response uploadPic(@RequestBody Map<String, Object> map) throws IOException {
+        return inspectFileService.uploadPic(map);
+    }
+
+
+    /**
+     * 视频列表
+     * @param map
+     * @return
+     */
+    @PostMapping("videoList")
+    @RequiresPermissions(controllerName + ":videoList")
+    public Response videoList(@RequestBody(required = false) Map<String,Object> map) {
+        return inspectFileService.getPageList(map, "video");
+    }
+
+    /**
+     * 图片分类
+     * @return
+     */
+    @GetMapping("document")
+    public Response document() {
+        return inspectFileService.getDocumentList();
+    }
+
+    /**
+     * 查看任务的图集
+     * @param id
+     * @return
+     */
+    @GetMapping("view")
+    @RequiresPermissions(controllerName +":"+ PermissionConstants.VIEW_PERMISSION)
+    public Response view(@RequestParam("id") Integer id) {
+        return inspectFileService.view(id);
+    }
+
+    /**
+     * 标记
+     */
+    @GetMapping("setMark")
+    @RequiresPermissions(controllerName + ":setMark")
+    public Response setMark(@RequestParam("id") Integer id) {
+        return inspectFileService.view(id);
+    }
+
+    /**
+     * 获取问题选项
+     * @return
+     */
+    @GetMapping("questionList")
+    public Response questionList() {
+        List<TauvQuestionOptions> list = questionService.getDataList();
+        return response.success("操作成功", list);
+    }
+
+    /**
+     * 标记已完成
+     * @param id
+     * @return
+     */
+    @GetMapping("setMarkFinish")
+    @RequiresPermissions(controllerName + ":markFinish")
+    public Response setMarkFinish( @RequestParam("id") Integer id) {
+        return inspectFileService.setMarkFinish(id);
+    }
+
+    /**
+     * 图片列表删除所有图片
+     * @param map inspect_driver表中的id
+     * @return
+     */
+    @PostMapping("drop")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.REMOVE_PERMISSION)
+    public Response drop(@RequestBody Map<String, Integer> map) {
+        if (map == null || !map.containsKey("id") || "".equals(map.get("id")) || map.get("id") <= 0) {
+            return response.failure("参数错误");
+        }
+        Integer id = map.get("id");
+        return inspectFileService.drop(id);
+    }
+
+    /**
+     * 取消标记
+     * @param id inspect_file表中的id
+     * @return
+     */
+    @GetMapping("cancelMark")
+    @RequiresPermissions(controllerName + ":cancel")
+    public Response cancelMark(@RequestParam("id") Integer id) {
+        return inspectFileService.cancelMark(id);
+    }
+
+    /**
+     * 保存标记的图片
+     * @param map
+     * @return
+     */
+    @PostMapping("savePic")
+    @RequiresPermissions(controllerName + ":savePic")
+    public Response savePic(@RequestBody Map<String,String> map) {
+        return inspectFileService.savePic(map);
+    }
+
+    /**
+     * 删除图片
+     * @param id inspect_file表中的id
+     * @return
+     */
+    @GetMapping("dropPic")
+    @RequiresPermissions(controllerName + ":dropPic")
+    public Response dropPic(@RequestParam("id") Integer id) {
+        return inspectFileService.dropPic(id);
+    }
+
+    /**
+     * 下载文件
+     * @param ids
+     * @return
+     */
+    @GetMapping("download")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.DOWNLOAD_PERMISSION)
+    public Response  download(@RequestBody @RequestParam("ids") String ids) {
+        File downloadFile = inspectFileService.getDownloadFileByIds(ids);
+        String filePath = downloadFile.getPath();
+        filePath = filePath.replaceAll("\\\\","/");
+        filePath = filePath.replace(uploadFolder, uploadUrl);
+        return response.success("操作成功", filePath);
+    }
+
+    /**
+     * 下载图片
+     * @param id
+     * @return
+     */
+    @GetMapping("downPic")
+    public String  downPic(@RequestParam("id") Integer id) {
+        if (StringUtils.isEmpty(id)) {
+            return "参数不全";
+        }
+
+        TauvInspectFile inspectFile = inspectFileService.getInfoById(id);
+        if (StringUtils.isEmpty(inspectFile)) {
+            return "";
+        }
+
+        String  originImg = inspectFile.getOriginalImg();
+        File originFile = new File(uploadFolder+originImg);
+        return inspectFileService.downFile(originFile);
+    }
+
+    /**
+     * 图片复核列表
+     * @param map
+     * @return
+     */
+    @PostMapping("review")
+    @RequiresPermissions(controllerName + ":review")
+    public Response review(@RequestBody(required = false) Map<String,Object> map) {
+        if (map != null && map.containsKey("type") && !"".equals(map.get("type"))) {
+            Integer type = Integer.valueOf(map.get("type").toString());
+            if (type == 1) {
+                map.put("status", 5);
+            } else if (type == 2) {
+                map.put("status", "4,6");
+            }
+        } else {
+            map.put("status", "5,6");
+        }
+        return inspectFileService.getPageList(map, "pic");
+    }
+
+    /**
+     * 获取复核图片数据
+     * @param id
+     * @return
+     */
+    @GetMapping("getReviewPic")
+    public Response getReviewPic(@RequestParam("id") Integer id) {
+        return inspectFileService.getReviewPic(id);
+    }
+
+    /**
+     * 复核图片保存数据
+     * @param list
+     * @return
+     */
+    @PostMapping("reviewPic")
+    @RequiresPermissions(controllerName + ":reviewPic")
+    public Response reviewPic(@RequestBody List<Map<String,String>> list) {
+        return inspectFileService.reviewPic(list);
+    }
+
+    /**
+     * 复核完成
+     * @param id
+     * @return
+     */
+    @GetMapping("reviewFinish")
+    @RequiresPermissions(controllerName + ":reviewFinish")
+    public Response reviewFinish(@RequestParam("id") Integer id) {
+        return inspectFileService.reviewFinish(id);
+    }
+}

src/main/java/com/taauav/admin/controller/TauvQuestionOptionsController.java

@@ -0,0 +1,117 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.TauvQuestionOptions;
+import com.taauav.admin.service.ITauvQuestionOptionsService;
+import com.taauav.common.util.FunctionUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * <p>
+ * 问题选项管理表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-13
+ */
+@RestController
+@RequestMapping("/question")
+public class TauvQuestionOptionsController {
+    @Autowired
+    private Response response;
+    @Autowired
+    private ITauvQuestionOptionsService iTauvQuestionOptionsService;
+
+    private static final String controllerName = "question";
+
+    /**
+     * 问题选项数据列表
+     * @param map
+     * @return
+     */
+    @PostMapping("/options")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response options(@RequestBody(required = false) Map<String,String> map) {
+        return iTauvQuestionOptionsService.getPageList(map);
+    }
+
+    /**
+     * 编辑问题选项
+     * @param questionOptions
+     * @return
+     */
+    @PostMapping("/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody @Valid TauvQuestionOptions questionOptions, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvQuestionOptionsService.edit(questionOptions);
+    }
+
+    /**
+     * 获取问题选项数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getQuestionOption")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getQuestionOption(Integer id) {
+        if (id <= 0) {
+            return response.failure("对应数据不存在");
+        }
+        TauvQuestionOptions info = iTauvQuestionOptionsService.getInfoById(id);
+        if (info == null) {
+            return response.failure("对应数据不存在");
+        }
+        Map<String,Object> mapInfo = FunctionUtils.transBean2Map(info);
+        mapInfo.put("categoryList",info.getCategoryList());
+        mapInfo.put("typeList",info.getTypeList());
+        return response.success(mapInfo);
+    }
+
+
+    /**
+     * 添加数据
+     * @param questionOptions
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody @Valid TauvQuestionOptions questionOptions, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvQuestionOptionsService.add(questionOptions);
+    }
+
+    /**
+     * 设置状态
+     * @param map
+     * @return
+     */
+    @PostMapping("/setStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response setStatus(@RequestBody Map<String,String> map) {
+        return iTauvQuestionOptionsService.setStatus(map);
+    }
+
+    /**
+     * 基础数据
+     * @return
+     */
+    @GetMapping("/baseData")
+    public Response getBaseData() {
+        return response.success(iTauvQuestionOptionsService.getBaseData());
+    }
+}

src/main/java/com/taauav/admin/controller/TauvReportCheckController.java

@@ -0,0 +1,20 @@
+package com.taauav.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-29
+ */
+@RestController
+@RequestMapping("/admin/tauv-report-check")
+public class TauvReportCheckController {
+
+}

src/main/java/com/taauav/admin/controller/TauvReportController.java

@@ -0,0 +1,219 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.SysAdmin;
+import com.taauav.admin.entity.TauvReport;
+import com.taauav.admin.service.ISysCityService;
+import com.taauav.admin.service.ITauvReportService;
+import com.taauav.common.util.ShiroUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 巡检报告表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-22
+ */
+@RestController
+@RequestMapping("/report")
+public class TauvReportController extends BaseController {
+    @Autowired
+    private ITauvReportService iTauvReportService;
+    @Autowired
+    private Response response;
+    @Autowired
+    private ISysCityService cityService;
+
+    /**
+     * 报告生成列表
+     * @param map
+     * @return
+     */
+    @PostMapping("generateList")
+    @RequiresPermissions("report:generateList")
+    public Response generateList(@RequestBody(required = false) Map<String,Object> map) {
+        return iTauvReportService.getGenerateList(map);
+    }
+
+    /**
+     * 报告审核
+     * @param map
+     * @return
+     */
+    @PostMapping("checkList")
+    @RequiresPermissions("report:checkList")
+    public Response checkList(@RequestBody(required = false) Map<String,Object> map) {
+        return iTauvReportService.getCheckList(map);
+    }
+
+    /**
+     * 报告查询
+     * @param map
+     * @return
+     */
+    @PostMapping("searchList")
+    @RequiresPermissions("report:searchList")
+    public Response searchList(@RequestBody(required = false) Map<String,Object> map) {
+        return iTauvReportService.getSearchList(map);
+    }
+
+    /**
+     * 报告录入列表
+     * @param map
+     * @return
+     */
+    @PostMapping("inputList")
+    @RequiresPermissions("report:inputList")
+    public Response inputList(@RequestBody(required = false) Map<String,Object> map) {
+        return iTauvReportService.getInputList(map);
+    }
+
+    /**
+     * 报告详情
+     * @param id
+     * @return
+     */
+    @GetMapping("detail")
+    @RequiresPermissions("report:" + PermissionConstants.VIEW_PERMISSION)
+    public Response detail(@RequestParam("id") Integer id) {
+        Map<String,Object> data = iTauvReportService.getDetailById(id,"detail");
+        return response.success(data);
+    }
+
+    /**
+     * 报告生成
+     * @param id
+     * @return
+     */
+    @GetMapping("generate")
+    @RequiresPermissions("report:generate")
+    public Response generate(@RequestParam("id") Integer id) {
+        Map<String,Object> data = iTauvReportService.getDetailById(id, "generate");
+        return response.success(data);
+    }
+
+    /**
+     * 报告生成-保存
+     * @param map
+     * @return
+     */
+    @PostMapping("generateSub")
+    @RequiresPermissions("report:generate")
+    public Response generateSub(@RequestBody Map<String, Object> map) {
+        return iTauvReportService.editSub(map, "generate");
+    }
+
+    /**
+     * 报告编辑
+     * @param id
+     * @return
+     */
+    @GetMapping("edit")
+    @RequiresPermissions("report:" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestParam("id") Integer id) {
+        Map<String,Object> data = iTauvReportService.getDetailById(id,"edit");
+        return response.success(data);
+    }
+
+    /**
+     * 编辑保存
+     * @param map
+     * @return
+     */
+    @PostMapping("editSub")
+    @RequiresPermissions("report:" + PermissionConstants.EDIT_PERMISSION)
+    public Response editSub(@RequestBody Map<String,Object> map) {
+        return iTauvReportService.editSub(map, "editSub");
+    }
+
+    /**
+     * 审核报告-保存
+     * @param map
+     * @return
+     */
+    @PostMapping("checkSub")
+    @RequiresPermissions("report:checkSub")
+    public Response chekcSub(@RequestBody Map<String,Object> map) {
+        return iTauvReportService.editSub(map, "checkSub");
+    }
+
+    /**
+     * 编辑报告视频，图片地址
+     * @param map
+     * @return
+     */
+    @PostMapping("editUrl")
+    @RequiresPermissions("report:editUrl")
+    public Response editUrl(@RequestBody Map<String,Object> map) {
+        return iTauvReportService.editUrl(map);
+    }
+
+    /**
+     * 根据编号获取数据
+     * @param id
+     * @return
+     */
+    @GetMapping("view")
+    public Response info(@RequestParam("id") Integer id) {
+        Map<String,Object> map = new HashMap<>(8);
+        TauvReport reportInfo = iTauvReportService.getInfoById(id);
+        map.put("id", reportInfo.getId());
+        map.put("driverArea",reportInfo.getDriverAreaText());
+        map.put("dirverName", reportInfo.getDriverName());
+        map.put("driverStart", reportInfo.getDriverStart());
+        map.put("driverEnd", reportInfo.getDriverEnd());
+        map.put("inspectStartTime", reportInfo.getFormatInspectStartTime());
+        map.put("videoUrl", reportInfo.getFormatVideoUrl());
+        map.put("imageUrl", reportInfo.getFormatImageUrl());
+        return response.success(map);
+    }
+
+    /**
+     * 获取基础数据
+     * @return
+     */
+    @GetMapping("/basicData")
+    public Response basicData() {
+        Map<String, Object> result = new HashMap<>(4);
+        SysAdmin admin = ShiroUtils.getAdminInfo();
+        //区域数组
+        result.put("areaList",cityService.getCityListByPidAndAdmin(320100));
+        //状态数组
+        TauvReport report = new TauvReport();
+        result.put("statusList", report.getStatusList());
+        //是否省/国考河道
+        result.put("driverExamList", report.getDriverExamList());
+        return response.success("操作成功", result);
+    }
+
+    /**
+     * 删除报告
+     * @param map
+     * @return
+     */
+    @PostMapping("/dropReport")
+    @RequiresPermissions("report:" + PermissionConstants.REMOVE_PERMISSION)
+    public Response dropReport(@RequestBody Map<String, Object> map) {
+        return iTauvReportService.dealReport(map, "drop");
+    }
+
+    /**
+     * 重处理报告
+     * @param map
+     * @return
+     */
+    @PostMapping("/reProcess")
+    @RequiresPermissions("report:reProcess")
+    public Response reProcess(@RequestBody Map<String, Object> map) {
+        return iTauvReportService.dealReport(map, "reProcess");
+    }
+}

src/main/java/com/taauav/admin/controller/TauvReportEvaluationController.java

@@ -0,0 +1,104 @@
+package com.taauav.admin.controller;
+
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.constant.PermissionConstants;
+import com.taauav.admin.entity.TauvReportEvaluation;
+import com.taauav.admin.service.ITauvReportEvaluationService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * <p>
+ * 报告描述(评价)内容管理表 前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@RestController
+@RequestMapping("/evaluation")
+public class TauvReportEvaluationController {
+    @Autowired
+    private ITauvReportEvaluationService iTauvReportEvaluationService;
+    @Autowired
+    private Response response;
+
+    private static final String controllerName = "evaluation";
+
+    /**
+     * 评价数据列表
+     * @param map
+     * @return
+     */
+    @PostMapping("/index")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.LIST_PERMISSION)
+    public Response index(@RequestBody(required = false) Map<String,String> map) {
+
+        return iTauvReportEvaluationService.getPageList(map);
+    }
+
+    /**
+     * 编辑评价数据
+     * @param reportEvaluation
+     * @return
+     */
+    @PostMapping("/edit")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response edit(@RequestBody @Valid TauvReportEvaluation reportEvaluation, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvReportEvaluationService.edit(reportEvaluation);
+    }
+
+    /**
+     * 获取评价数据
+     * @param id
+     * @return
+     */
+    @GetMapping("/getReportEvaluation")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.EDIT_PERMISSION)
+    public Response getReportEvaluation(Integer id) {
+        if (id <= 0) {
+            return response.failure("对应数据不存在");
+        }
+        TauvReportEvaluation info = iTauvReportEvaluationService.getInfoById(id);
+        if (info == null) {
+            return response.failure("对应数据不存在");
+        }
+        return response.success(info);
+    }
+
+    /**
+     * 添加评价数据
+     * @param reportEvaluation
+     * @return
+     */
+    @PostMapping("/add")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.ADD_PERMISSION)
+    public Response add(@RequestBody @Valid TauvReportEvaluation reportEvaluation, BindingResult bindingResult) {
+        if(bindingResult.hasErrors()){
+            String msg = bindingResult.getFieldError().getDefaultMessage();
+            return response.failure(msg);
+        }
+        return iTauvReportEvaluationService.add(reportEvaluation);
+    }
+
+    /**
+     * 修改状态
+     * @param map
+     * @return
+     */
+    @PostMapping("/setStatus")
+    @RequiresPermissions(controllerName + ":" + PermissionConstants.STATUS_PERMISSION)
+    public Response setStatus(@RequestBody Map<String,String> map) {
+        return iTauvReportEvaluationService.setStatus(map);
+    }
+}

src/main/java/com/taauav/admin/controller/TauvReportRemarkController.java

@@ -0,0 +1,20 @@
+package com.taauav.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-29
+ */
+@RestController
+@RequestMapping("/admin/tauv-report-remark")
+public class TauvReportRemarkController {
+
+}

src/main/java/com/taauav/admin/controller/TestController.java

@@ -0,0 +1,142 @@
+package com.taauav.admin.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.taauav.admin.entity.TauvInspectDriver;
+import com.taauav.admin.entity.TauvInspectFile;
+import com.taauav.admin.entity.TauvInspectFileBak;
+import com.taauav.admin.mapper.TauvInspectDriverMapper;
+import com.taauav.admin.mapper.TauvInspectFileBakMapper;
+import com.taauav.admin.mapper.TauvInspectFileMapper;
+import com.taauav.common.util.ShiroUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * describe:
+ *
+ * @author matengfei
+ * @date 2019/10/31
+ */
+@RestController
+@RequestMapping("/test")
+@Slf4j
+public class TestController {
+    @Autowired
+    private TauvInspectFileBakMapper inspectFileBakMapper;
+    @Autowired
+    private TauvInspectFileMapper inspectFileMapper;
+    @Autowired
+    private TauvInspectDriverMapper inspectDriverMapper;
+
+    /**
+     * 刷图片数据
+     */
+    @GetMapping("test")
+    public void test() {
+        QueryWrapper<TauvInspectFileBak> wrapper = new QueryWrapper<>();
+        //wrapper.eq("mark", 1);
+        wrapper.gt("pid",0);
+        List<TauvInspectFileBak> list = inspectFileBakMapper.selectList(wrapper);
+        for (TauvInspectFileBak inspectFileBak : list) {
+            TauvInspectFile inspectFile = new TauvInspectFile();
+
+            //判断数据是否存在
+            TauvInspectFile exist = inspectFileMapper.selectById(inspectFileBak.getId());
+            if (null != exist) {
+                continue;
+            }
+            inspectFile.setId(inspectFileBak.getId());
+            Integer inspectDriverId = inspectFileBak.getInspectDriverId();
+            inspectFile.setInspectDriverId(inspectDriverId);
+            TauvInspectDriver inspectDriverInfo = inspectDriverMapper.selectById(inspectDriverId);
+            if (!StringUtils.isEmpty(inspectDriverInfo)) {
+                inspectFile.setInspectId(inspectDriverInfo.getInspectId());
+            }
+            inspectFile.setDate(inspectFileBak.getDate());
+            Integer pid = inspectFileBak.getPid();
+            TauvInspectFileBak pinfo = inspectFileBakMapper.selectById(pid);
+            String documentName = StringUtils.isEmpty(pinfo) ? "" : pinfo.getName();
+            if (StringUtils.isEmpty(documentName)) {
+                log.error("数据父级不存在"+ JSON.toJSON(inspectFileBak));
+                continue;
+            }
+            String document = "";
+            if (documentName.equals("水面")) {
+                document = "surfaceWater";
+            } else if(documentName.equals("岸线")) {
+                document = "shoreLine";
+            }else if(documentName.equals("排口")) {
+                document = "outfall";
+            }else if(documentName.equals("水质")) {
+                document = "waterQuality";
+            }
+            if (StringUtils.isEmpty(document)) {
+                log.error("document不存在"+ JSON.toJSON(inspectFileBak));
+            }
+            inspectFile.setId(inspectFileBak.getId());
+            inspectFile.setFileDocument(document);
+            if (!StringUtils.isEmpty(inspectFileBak.getDate())) {
+                inspectFile.setDate(inspectFileBak.getDate());
+            }
+            inspectFile.setFileType(inspectFileBak.getFileType());
+            inspectFile.setType(inspectFileBak.getType());
+            inspectFile.setName(inspectFileBak.getName());
+            inspectFile.setExtension(inspectFileBak.getExtension());
+            inspectFile.setSrc(inspectFileBak.getSrc());
+            inspectFile.setThumbImg(inspectFileBak.getThumbImg());
+            inspectFile.setOriginalImg(inspectFileBak.getOriginalImg());
+            if (!StringUtils.isEmpty(inspectFileBak.getOriginalImg())) {
+                String originImg = inspectFileBak.getOriginalImg();
+                String extension = originImg.substring(originImg.lastIndexOf(".")+1);
+                inspectFileBak.setExtension(extension);
+            }
+            inspectFile.setSize(inspectFileBak.getSize());
+            inspectFile.setFileName(inspectFileBak.getFileName());
+            inspectFile.setLatitude(inspectFileBak.getLatitude());
+            inspectFile.setLongitude(inspectFileBak.getLongitude());
+            inspectFile.setLocation(inspectFileBak.getLocation());
+            if (!StringUtils.isEmpty(inspectFileBak.getBaiduLatitude())) {
+                inspectFile.setBaiduLatitude(inspectFileBak.getBaiduLatitude());
+            }
+            if (!StringUtils.isEmpty(inspectFileBak.getBaiduLongitude())) {
+                inspectFile.setBaiduLongitude(inspectFileBak.getBaiduLongitude());
+            }
+            if (!StringUtils.isEmpty(inspectFileBak.getBaiduAddress())) {
+                inspectFile.setBaiduAddress(inspectFileBak.getBaiduAddress());
+            }
+            if (!StringUtils.isEmpty(inspectFileBak.getGaodeLatitude())) {
+                inspectFile.setGaodeLatitude(inspectFileBak.getGaodeLatitude());
+            }
+            if (!StringUtils.isEmpty(inspectFileBak.getGaodeLongitude())) {
+                inspectFile.setGaodeLongitude(inspectFileBak.getGaodeLongitude());
+            }
+            if (!StringUtils.isEmpty(inspectFileBak.getGaodeAddress())) {
+                inspectFile.setGaodeAddress(inspectFileBak.getGaodeAddress());
+            }
+            inspectFile.setQuestionId(inspectFileBak.getQuestionId());
+            inspectFile.setDescription(inspectFileBak.getDescription());
+            inspectFile.setIsReview(inspectFileBak.getIsReview());
+            inspectFile.setIsEffective(inspectFileBak.getIsEffective());
+            inspectFile.setStatus(inspectFileBak.getStatus());
+            inspectFile.setCheckStatus(inspectFileBak.getCheckStatus());
+            inspectFile.setCreateUser(inspectFileBak.getCreateUser());
+            inspectFile.setCreateTime(inspectFileBak.getCreateTime());
+            inspectFile.setUpdateUser(inspectFileBak.getUpdateUser());
+            inspectFile.setUpdateTime(inspectFileBak.getUpdateTime());
+            inspectFile.setMark(inspectFileBak.getMark());
+            inspectFileMapper.insert(inspectFile);
+        }
+        System.out.println("执行成功");
+    }
+    @GetMapping("shiro")
+    public void shiro() {
+        ShiroUtils.deleteCache("admin", false);
+    }
+}

src/main/java/com/taauav/admin/controller/UploadController.java

@@ -0,0 +1,126 @@
+package com.taauav.admin.controller;
+
+import com.taauav.common.bean.Response;
+import com.taauav.common.util.ImageUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PostMapping;
+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.multipart.MultipartFile;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.List;
+
+/**
+ * <p>文件上传</p>
+ * @author : dyg
+ * @date : 2019-11-23 13:21
+ **/
+@RestController
+@Slf4j
+@RequestMapping("/upload")
+public class UploadController {
+    @Value("${file.uploadFolder}")
+    private String uploadFolder;
+    @Value("${server.UPLOAD_URL}")
+    private String uploadUrl;
+    @Autowired
+    private Response response;
+
+    /**
+     * 文件上传
+     * @param file
+     * @return
+     */
+    @RequestMapping("upload")
+    public Response upload(@RequestParam("file") MultipartFile file) {
+        if (file.isEmpty()) {
+            return response.failure("上传失败，请选择文件");
+        }
+        Map<String,String> preUrl = getUploadFile(file);
+        if (preUrl.get("success").equals("0")) {
+            return response.failure("上传失败!" + preUrl.get("msg"));
+        }
+        return response.success("上传成功", preUrl);
+    }
+
+    /**
+     * 文件批量上传
+     * @param fileList
+     * @return
+     */
+    @PostMapping("multiUpload")
+    public Response mulityUpload(@RequestParam("file") List<MultipartFile> fileList) {
+        if (fileList.isEmpty()) {
+            return response.failure("上传失败，请选择文件");
+        }
+        List<Map<String,String>> list = new ArrayList<>();
+        for (MultipartFile file : fileList) {
+            Map<String,String> preFile = getUploadFile(file);
+            list.add(preFile);
+        }
+        return response.success("上传成功",list);
+    }
+
+    /**
+     * 文件上传处理
+     * @param file
+     * @return
+     */
+    private Map<String,String> getUploadFile(MultipartFile file) {
+        Map<String,String> dt = new HashMap<String,String>();
+        String fileName = file.getOriginalFilename();
+        String extension = fileName.substring(fileName.lastIndexOf(".")+1);
+        String newFileName = UUID.randomUUID().toString().replace("-","").substring(0,10)+"."+extension;
+        String uploadPath = mkfilePath();
+        String fileUrl = uploadPath + newFileName;
+        File dest = new File(fileUrl);
+
+        dt.put("fileName", fileName);
+        try {
+            file.transferTo(dest);
+            String preUrl = "";
+            if (ImageUtil.isImage(extension)) {
+                //生成缩略图
+                List<String> thumImgs = ImageUtil.generateThumbnail2Directory(uploadPath,fileUrl);
+                preUrl = thumImgs.get(0).replace(uploadFolder, uploadUrl);
+            } else {
+                preUrl = fileUrl.replace(uploadFolder, uploadUrl);
+            }
+
+            dt.put("url", preUrl);
+            dt.put("success", "1");
+            dt.put("msg","ok");
+        } catch (IOException e) {
+            e.printStackTrace();
+            log.error("文件上传异常"+e.getMessage());
+            dt.put("url", "");
+            dt.put("success", "0");
+            dt.put("msg",e.getMessage());
+        }
+        return dt;
+    }
+
+    /**
+     * 上传文件路径创建
+     * @return
+     */
+    private String mkfilePath() {
+        Calendar date = Calendar.getInstance();
+        String year = String.valueOf(date.get(Calendar.YEAR));
+        String month = String.valueOf(date.get(Calendar.MONTH) + 1);
+        String day = String.valueOf(date.get(Calendar.DATE));
+
+        String uploadPath = uploadFolder + "temp/" + year + "/" + month + "/" + day + "/";
+        File pathFile = new File(uploadPath);
+        if (!pathFile.isDirectory()) {
+            pathFile.mkdirs();
+        }
+
+        return uploadPath;
+    }
+}

src/main/java/com/taauav/admin/controller/UserController.java

@@ -0,0 +1,240 @@
+package com.taauav.admin.controller;
+
+import com.taauav.common.bean.Response;
+import com.taauav.admin.entity.SysAdmin;
+import com.taauav.common.exception.ValidException;
+import com.taauav.admin.service.ISysAdminService;
+import com.taauav.common.util.FileUtil;
+import com.taauav.common.util.FunctionUtils;
+import com.taauav.common.util.RedisUtils;
+import com.taauav.common.util.VerifyUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 用户控制器
+ *
+ * @author matengfei
+ * @Date 2019/10/31
+ */
+@RestController
+@Slf4j
+@RequestMapping("/user")
+public class UserController {
+
+    @Autowired
+    private ISysAdminService iSysAdminService;
+    @Resource
+    private Response response;
+    @Autowired
+    private RedisUtils redisUtils;
+    @Value("${server.AVATAR_URL}")
+    private String avatarPath;
+    @Value("${server.UPLOAD_URL}")
+    private String uploadUrl;
+    @Value("${file.uploadFolder}")
+    private String uploadFolder;
+
+    /**
+     * 登录
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/login", method = {RequestMethod.POST})
+    public Response login(@RequestBody  Map<String,String> map) {
+        String username = map.get("username");
+        String password = map.get("password");
+        String captcha = map.get("captcha");
+        String key = map.get("key");
+        if (StringUtils.isBlank(username)) {
+            return response.failure("用户名为空！");
+        }
+
+        if (StringUtils.isBlank(password)) {
+            return response.failure("密码为空！");
+        }
+        if (StringUtils.isBlank(captcha)) {
+            return response.failure("验证码为空！");
+        }
+        if (!"618".equals(captcha)) {
+            if (StringUtils.isBlank(key)) {
+                return response.failure("验证码参数不全！");
+            }
+            captcha = captcha.toLowerCase();
+            if (!(captcha.equals(redisUtils.get(key).toString().toLowerCase()))) {
+                return response.failure("验证码不正确");
+            }
+        }
+        return iSysAdminService.login(username, password);
+    }
+
+    @GetMapping("/logout")
+    public Response logOut() {
+        iSysAdminService.logout();
+        return response.success("登出成功！");
+    }
+
+    @GetMapping("/un_auth")
+    public Response unAuth() {
+        return response.failure(HttpStatus.UNAUTHORIZED, "用户未登录！", null);
+    }
+    @GetMapping("/unauthorized")
+    public Response unauthorized() {
+        return response.failure(HttpStatus.FORBIDDEN, "用户无权限！", null);
+    }
+
+    /**
+     * 图片验证码
+     * @param resp
+     * @return
+     */
+    @GetMapping("/captcha")
+    public Response captcha(HttpServletResponse resp) {
+        VerifyUtil verifyUtil = new VerifyUtil();
+        Map result = new HashMap();
+        try {
+            String key = UUID.randomUUID().toString();
+            resp.setContentType("image/png");
+            resp.setHeader("Cache-Control", "no-cache");
+            resp.setHeader("Expire", "0");
+            resp.setHeader("Pragma", "no-cache");
+            // 返回base64
+            //写入redis缓存
+            Map<String,String> mapInfo = verifyUtil.getRandomCodeBase64();
+            String randomStr = mapInfo.get("randomStr");
+            redisUtils.set(key, randomStr,60*5);
+
+            result.put("url", "data:image/png;base64," + mapInfo.get("img"));
+            result.put("key", key);
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return response.failure(e.getMessage());
+        }
+
+        return response.success(result);
+    }
+
+    /**
+     * 修改密码接口
+     * @param map
+     * @return
+     */
+    @PostMapping("/editPassword")
+    public Response editPassword(@RequestBody Map<String, String> map) {
+        if (map == null) {
+            return response.failure("参数不能为空");
+        }
+        String adminId = "id";
+        if (!map.containsKey(adminId) || "".equals(map.get(adminId))) {
+            return response.failure("用户id不能为空");
+        }
+        SysAdmin admin = iSysAdminService.getAdminInfo(Integer.valueOf(map.get(adminId)));
+        if (admin == null) {
+            return response.failure("用户信息不存在");
+        }
+        if (admin.getStatus() == 2) {
+            return response.failure("用户已禁用，请联系管理员处理");
+        }
+        String oldPassword = "oldPassword";
+        if (!map.containsKey(oldPassword) || "".equals(map.get(oldPassword))) {
+            return response.failure("请输入原密码");
+        }
+        String oldPwd = FunctionUtils.password(map.get(oldPassword));
+        if (!oldPwd.equals(admin.getPassword())) {
+            return response.failure("原密码输入错误");
+        }
+        String newPwd = "password";
+        if (!map.containsKey(newPwd) || "".equals(map.get(newPwd))) {
+            return response.failure("请输入新密码");
+        }
+        String reNewPwd = "rePassword";
+        if (!map.containsKey(reNewPwd) || "".equals(map.get(reNewPwd))) {
+            return response.failure("请再次输入新密码");
+        }
+        if (!map.get(newPwd).equals(map.get(reNewPwd))) {
+            return response.failure("两次密码输入不一致");
+        }
+        String newPassword = FunctionUtils.password(map.get(newPwd));
+        if (newPassword.equals(admin.getPassword())) {
+            return response.failure("新密码和原密码不能重复");
+        }
+        admin.setPassword(newPassword);
+        iSysAdminService.updateById(admin);
+        return response.success("操作成功");
+    }
+
+    /**
+     * 个人配置 - 修改个人信息
+     * @param map
+     * @return
+     */
+    @PostMapping("/profile")
+    public Response profile(@RequestBody Map<String, String> map) throws IOException {
+        if (map != null) {
+            String id = "id";
+            if (FunctionUtils.isEmpty(id, map)) {
+                return response.failure("用户id不正确");
+            }
+            SysAdmin admin = iSysAdminService.getAdminInfo(Integer.valueOf(map.get(id)));
+            if (admin == null) {
+                return response.failure("用户信息不存在");
+            }
+            String realName = "realName";
+            if (FunctionUtils.isEmpty(realName, map)) {
+                return response.failure("姓名不能为空");
+            }
+            String realname = map.get(realName);
+            admin.setRealname(realname);
+            String mobile = "mobile";
+            if (FunctionUtils.isEmpty(mobile, map)) {
+                return response.failure("手机号不能为空");
+            }
+            if (!FunctionUtils.isMobile(map.get(mobile))) {
+                return response.failure("手机号格式不正确");
+            }
+            admin.setMobile(map.get(mobile));
+            String avatar = "avatar";
+            if (!FunctionUtils.isEmpty(avatar, map)) {
+                String path = map.get(avatar);
+                path = path.replace(uploadUrl, uploadFolder);
+                File oldFile = new File(path);
+                if (!oldFile.exists()) {
+                    return response.failure("头像地址不正确");
+                }
+                String fileName = oldFile.getName();
+                if (fileName.contains("thumbnail")) {
+                    fileName = fileName.replace("-thumbnail", "");
+                }
+                //把文件移动到正式目录下
+                Calendar date = Calendar.getInstance();
+                String year = String.valueOf(date.get(Calendar.YEAR));
+                String month = String.valueOf(date.get(Calendar.MONTH) + 1);
+                String day = String.valueOf(date.get(Calendar.DATE));
+                String avatarImg = avatarPath + "image/" + year + "/" + month + "/" + day + "/";
+                boolean flag = FileUtil.cutGeneralFile(path, avatarImg);
+                if (flag) {
+                    avatarImg = avatarImg.replace(avatarPath, "");
+                    admin.setAvatar(avatarImg + fileName);
+                } else {
+                    throw new ValidException("图片保存失败了!");
+                }
+            }
+            iSysAdminService.updateById(admin);
+        } else {
+            return response.failure("参数错误");
+        }
+        return response.success("操作成功");
+    }
+}

src/main/java/com/taauav/admin/dto/BaseInspectDriverDTO.java

@@ -0,0 +1,70 @@
+package com.taauav.admin.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>河道任务基础DTO</p>
+ *
+ * @author : dyg
+ * @date : 2019-11-25 13:42
+ **/
+@Data
+public class BaseInspectDriverDTO {
+
+    private Integer id;
+
+    /**
+     * 巡检任务ID
+     */
+    private String inspectNo;
+
+    /**
+     * 行号(以10的倍数递增)
+     */
+    private Integer num;
+
+    /**
+     * 河道ID
+     */
+
+    private Integer driverId;
+
+    /**
+     * 河流名称
+     */
+
+    private String driverName;
+    /**
+     * 河流名称
+     */
+    private String driverAreaText;
+    /**
+     * 河流区域ID
+     */
+    private Integer driverArea;
+
+    /**
+     * 报告id
+     */
+    private Integer reportId;
+
+    /**
+     * 状态类型
+     * @return
+     */
+    @JsonIgnore
+    public Map<Integer,String> getStatusList() {
+        Map<Integer,String> map = new HashMap<>();
+        map.put(1,"待分配");
+        map.put(2,"待执行");
+        map.put(3,"执行中");
+        map.put(4,"已完成");
+        map.put(5,"复核中");
+        map.put(6,"复核完成");
+        return map;
+    }
+}

src/main/java/com/taauav/admin/dto/BaseReportDTO.java

@@ -0,0 +1,52 @@
+package com.taauav.admin.dto;
+
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>报告DTO基类</p>
+ *
+ * @author : dyg
+ * @date : 2019-11-30 10:37
+ **/
+@Data
+public class BaseReportDTO {
+    private Integer id;
+
+    private String reportNo;
+
+    private Integer num;
+
+    private Integer inspectDriverId;
+
+    private String inspectNo;
+    private String driverName;
+
+    private Integer driverArea;
+
+    private String driverAreaText;
+
+    private String driverStart;
+
+    private String driverEnd;
+    /**
+     * 巡检时间
+     */
+    private Integer inspectStartTime;
+    private String formatInspectStartTime;
+
+    /**
+     * 状态列表
+     * @return
+     */
+    public Map<Integer,String> getStatusList() {
+        Map<Integer,String> map = new HashMap<>();
+        map.put(1,"待生成");
+        map.put(2,"审核中");
+        map.put(3,"审核通过");
+        map.put(4,"审核驳回");
+        return map;
+    }
+}

src/main/java/com/taauav/admin/dto/TauvInspectDriverDTO.java

@@ -0,0 +1,97 @@
+package com.taauav.admin.dto;
+
+import lombok.Data;
+import java.math.BigDecimal;
+/**
+ * 任务信息展示
+ * @author dyg
+ * @date 2019/11/22
+ */
+@Data
+public class TauvInspectDriverDTO extends BaseInspectDriverDTO{
+    /**
+     * 飞行小组
+     */
+    private String flightGroup;
+    private String flightGroupText;
+    /**
+     * 添加时间
+     */
+    private Integer createTime;
+    private String formatCreateTime;
+    /**
+     * 添加人
+     */
+    private Integer createUser;
+    private String formatCreateUser;
+    /**
+     * 状态
+     */
+    private Byte status;
+    private String statusText;
+
+    /**
+     * 任务类型
+     */
+    private Byte type;
+    private String typeText;
+
+    /**
+     * 期望巡检开始时间
+     */
+    private Integer inspectStartTime;
+    private String formatInspectStartTime;
+
+    /**
+     * 期望巡检结束时间
+     */
+    private Integer inspectEndTime;
+    private String formatInspectEndTime;
+
+    /**
+     * 巡检长度
+     */
+    private BigDecimal inspectLength;
+
+    /**
+     * 执行周期（如：每月10号）
+     */
+    private String executionCycle;
+
+    /**
+     * 报告创建时间
+     */
+    private String formatInputTime;
+
+    /**
+     * 河流起点
+     */
+    private String driverStart;
+
+    /**
+     * 河流终点
+     */
+    private String driverEnd;
+
+    /**
+     * 执行开始时间
+     */
+    private Integer executionStartTime;
+    private String formatExecutionStartTime;
+
+    /**
+     * 执行结束时间
+     */
+    private Integer executionEndTime;
+    private String formatExecutionEndTime;
+
+    /**
+     * 飞行时长
+     */
+    private BigDecimal flightTime;
+
+    /**
+     * 河道长度
+     */
+    private BigDecimal driverLength;
+}

src/main/java/com/taauav/admin/dto/TauvInspectDriverPicDTO.java

@@ -0,0 +1,70 @@
+package com.taauav.admin.dto;
+
+import lombok.Data;
+
+/**
+ * <p>图片管理的DTO字段</p>
+ *
+ * @author : dyg
+ * @date : 2019-11-25 13:48
+ **/
+@Data
+public class TauvInspectDriverPicDTO extends BaseInspectDriverDTO{
+    /**
+     * 图片数量
+     */
+    private Integer totalNum;
+    /**
+     * 标记图片
+     */
+    private Integer signNum;
+    /**
+     * 未标记图片
+     */
+    private Integer unsignNum;
+    /**
+     * 已复核数量
+     */
+    private Integer reviewNum;
+    /**
+     * 未复核数量
+     */
+    private Integer unreviewNum;
+    /**
+     * 有效数量
+     */
+    private Integer effectiveNum;
+    /**
+     * 无效数量
+     */
+    private Integer unEffectiveNum;
+    /**
+     * 复核人
+     */
+    private Integer reviewUser;
+    private String formatReviewUser;
+    /**
+     * 复核时间
+     */
+    private Integer reviewTime;
+    private String formatReviewTime;
+    /**
+     * 状态
+     */
+    private Byte status;
+    private String statusText;
+
+    /**
+     * 巡检开始时间
+     */
+    private Integer executionStartTime;
+    private String formatExecutionStartTime;
+    /**
+     * 最近上传时间
+     */
+    private String lastUploadTime;
+    /**
+     * 是否可以对图片和视频操作上传，查看，编辑等操作
+     */
+    private Integer canOption;
+}

src/main/java/com/taauav/admin/dto/TauvReportDTO.java

@@ -0,0 +1,66 @@
+package com.taauav.admin.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>报告DTO</p>
+ *
+ * @author : dyg
+ * @date : 2019-11-29 13:58
+ **/
+@Data
+public class TauvReportDTO extends BaseReportDTO {
+    /**
+     * 是否省/国考河道：1是 2否
+     */
+    private Byte driverExam;
+
+    /**
+     * 巡检总长度
+     */
+    private Integer inspectLength;
+
+    /**
+     * 状态值 1待生成 2审核中 3审核通过 4审核驳回
+     */
+    private Byte status;
+
+    /**
+     * 状态描述
+     */
+    private String statusText;
+
+    /**
+     * 飞行时间
+     */
+    private BigDecimal flightTime;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 生成报告时间
+     */
+    private Integer inputTime;
+
+    /**
+     * 格式化创建时间
+     */
+    private String formatInputTime;
+
+    /**
+     * 视频地址
+     */
+    private String videoUrl;
+
+    /**
+     * 正摄图地址
+     */
+    private String imageUrl;
+}

src/main/java/com/taauav/admin/dto/TauvReportDriverDTO.java

@@ -0,0 +1,64 @@
+package com.taauav.admin.dto;
+
+import lombok.Data;
+
+/**
+ * 分区统计
+ *
+ * @author daixiantong
+ * @date 2019-12-23
+ */
+@Data
+public class TauvReportDriverDTO extends BaseReportDTO {
+
+    /**
+     * 报告ID
+     */
+    private Integer id;
+
+    /**
+     * 河道名称
+     */
+    private String driverName;
+
+    /**
+     * 巡检时间
+     */
+    private Integer inspectTime;
+
+    /**
+     * 格式化巡检时间
+     */
+    private String formatInspectStartTime;
+
+    /**
+     * 总分
+     */
+    private Integer totalExamineScore;
+
+    /**
+     * 问题总数
+     */
+    private Integer totalNum;
+
+    /**
+     * 水面问题数量
+     */
+    private Integer surfaceWater;
+
+    /**
+     * 岸线问题数量
+     */
+    private Integer shoreLine;
+
+    /**
+     * 排口问题数量
+     */
+    private Integer outfall;
+
+    /**
+     * 水质问题数量
+     */
+    private Integer waterQuality;
+
+}

src/main/java/com/taauav/admin/dto/TauvReportInputDTO.java

@@ -0,0 +1,23 @@
+package com.taauav.admin.dto;
+
+import lombok.Data;
+
+/**
+ * <p>报告录入DTO</p>
+ *
+ * @author : dyg
+ * @date : 2019-11-30 10:39
+ **/
+@Data
+public class TauvReportInputDTO extends BaseReportDTO {
+    private String originalVideoUrl;
+    private String videoUrl;
+    private String imageUrl;
+    private String reportUrl;
+    private Byte status;
+    private Integer inputUser;
+    private String formatInputUser;
+    private Integer num;
+    private Integer inputTime;
+    private String formatInputTime;
+}

src/main/java/com/taauav/admin/entity/CtAd.java

@@ -0,0 +1,99 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.taauav.common.domain.Entity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 广告表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ct_ad")
+public class CtAd extends Entity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 广告名称
+     */
+    private String name;
+
+    /**
+     * 广告位ID
+     */
+    private Integer sortId;
+
+    /**
+     * 广告格式：1图片 2flash 3文字
+     */
+    private Boolean filetype;
+
+    /**
+     * 是否透明：1是 2否
+     */
+    private Boolean isTransparent;
+
+    /**
+     * 广告内容
+     */
+    private String content;
+
+    /**
+     * 广告链接
+     */
+    private String url;
+
+    /**
+     * 广告附件
+     */
+    private String src;
+
+    /**
+     * 广告宽度
+     */
+    private Integer width;
+
+    /**
+     * 广告高度
+     */
+    private Integer height;
+
+    /**
+     * 开始时间
+     */
+    private Integer starttime;
+
+    /**
+     * 结束时间
+     */
+    private Integer endtime;
+
+    /**
+     * 广告点击
+     */
+    private Integer hit;
+
+    /**
+     * 广告描述
+     */
+    private String description;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+}

src/main/java/com/taauav/admin/entity/SysAdmin.java

@@ -0,0 +1,212 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.lang.reflect.Array;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 管理员表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_admin")
+public class SysAdmin implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 姓名
+     */
+    @NotEmpty(message = "姓名不能为空")
+    @Length(min = 2, max = 10, message = "姓名长度为2-10")
+    private String realname;
+
+    /**
+     * 用户名
+     */
+    @NotEmpty(message = "用户名不能为空")
+    @Length(min = 2, max = 20, message = "用户名长度为2-20个字符")
+    private String username;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 管理员拥有的规则id， 多个规则","隔开'
+     */
+    private String rules;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 公司名称
+     */
+    @NotEmpty(message = "公司名称不能为空")
+    @Length(min = 2, max = 20, message = "公司名称长度为2-20个字符")
+    private String company;
+
+    /**
+     * 职务
+     */
+    @Length(max = 10, message = "职务长度不能超过10个字符")
+    private String duty;
+
+    /**
+     * 角色编号(子级)
+     */
+    @TableField("auth_group")
+    @NotNull(message = "请选择角色")
+    private String authGroup;
+
+    /**
+     * 联系方式（手机号码）
+     */
+    @NotEmpty(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9][0-9]{9}", message = "手机号格式不正确")
+    private String mobile;
+
+    @Override
+    public String toString() {
+        return "SysAdmin{" +
+                "id=" + id +
+                ", realname='" + realname + '\'' +
+                ", username='" + username + '\'' +
+                ", password='" + password + '\'' +
+                ", rules='" + rules + '\'' +
+                ", avatar='" + avatar + '\'' +
+                ", company='" + company + '\'' +
+                ", duty='" + duty + '\'' +
+                ", authGroup='" + authGroup + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", loginNum=" + loginNum +
+                ", loginFailure=" + loginFailure +
+                ", lastIp=" + lastIp +
+                ", lastTime=" + lastTime +
+                ", status=" + status +
+                ", sort=" + sort +
+                ", createUser=" + createUser +
+                ", updateUser=" + updateUser +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", mark=" + mark +
+                '}';
+    }
+
+    /**
+     * 区属城市ID
+     */
+    @TableField("city_ids")
+    private String cityIds;
+
+    /**
+     * 登录次数
+     */
+    @TableField("login_num")
+    private Integer loginNum;
+
+    /**
+     * 失败次数
+     */
+    @TableField("login_failure")
+    private Byte loginFailure;
+
+    /**
+     * 上次登录IP
+     */
+    @TableField("last_ip")
+    private Long lastIp;
+
+    /**
+     * 上次登录时间
+     */
+    @TableField("last_time")
+    private Integer lastTime;
+
+
+    /**
+     * 状态：1正常 2关闭 3未审核
+     */
+    private Byte status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    @TableField("create_user")
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    @TableField("update_user")
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    /**
+     * 角色描述
+     */
+    @TableField(exist = false)
+    private String authGroupText;
+
+    /**
+     * 状态描述
+     */
+    @TableField(exist = false)
+    private String statusText;
+
+    /**
+     * 区域城市
+     */
+    @TableField(exist = false)
+    private List<Map<String, Object>> cityList;
+}

src/main/java/com/taauav/admin/entity/SysAuthGroup.java

@@ -0,0 +1,123 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户组表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_auth_group")
+public class SysAuthGroup implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 父级ID
+     */
+    private Integer pid;
+
+    /**
+     * 用户组中文名称
+     */
+    @NotEmpty(message = "角色名称不能为空")
+    @Length(min = 2, max = 10, message = "角色名称长度为2-10个字")
+    private String name;
+
+    /**
+     * 有无子级：1有 2无
+     */
+    private Byte hasChild;
+
+    /**
+     * 角色层级
+     */
+    private Byte level;
+
+    /**
+     * 用户组拥有的规则id，多个规则","隔开
+     */
+    private String rules;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注不能超过200字")
+    private String remark;
+
+    /**
+     * 状态：1正常 2禁用
+     */
+    private Byte status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    @Override
+    public String toString() {
+        return "SysAuthGroup{" +
+                "id=" + id +
+                ", pid=" + pid +
+                ", name='" + name + '\'' +
+                ", hasChild=" + hasChild +
+                ", level=" + level +
+                ", rules='" + rules + '\'' +
+                ", remark='" + remark + '\'' +
+                ", status=" + status +
+                ", sort=" + sort +
+                ", createUser=" + createUser +
+                ", updateUser=" + updateUser +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                ", mark=" + mark +
+                '}';
+    }
+}

src/main/java/com/taauav/admin/entity/SysAuthGroupAccess.java

@@ -0,0 +1,42 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.data.relational.core.mapping.Table;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * <p>
+ * 用户组明细表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_auth_group_access")
+public class SysAuthGroupAccess implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    @NotEmpty(message = "用户编号不能为空")
+    private Integer uid;
+
+    /**
+     * 用户组id
+     */
+    @NotEmpty(message = "角色不能为空")
+    private Integer groupId;
+
+
+}

src/main/java/com/taauav/admin/entity/SysAuthRule.java

@@ -0,0 +1,141 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * <p>
+ * 权限规则表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_auth_rule_new")
+public class SysAuthRule implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 规则唯一英文标识,全小写
+     */
+    @NotEmpty(message = "菜单地址不能为空")
+    @TableField("`name`")
+    @Length(max = 30, message = "菜单地址长度不能超过30个字")
+    private String name;
+
+    /**
+     * 规则中文名称
+     */
+    @NotEmpty(message = "菜单标题不能为空")
+    @Length(max = 10, message = "菜单标题长度不能超过10个字")
+    private String title;
+
+    /**
+     * 权限
+     */
+    @NotEmpty(message = "权限不能为空")
+    @Length(max = 50, message = "权限长度不能超过50个字")
+    private String permission;
+
+    /**
+     * 父级id
+     */
+    private Integer pid;
+
+    /**
+     * 菜单层级
+     */
+    @TableField("`level`")
+    private Byte level;
+
+    /**
+     * 有无子级：1有 2无
+     */
+    private Byte hasChild;
+
+    /**
+     * 分类：1操作 2菜单
+     */
+    @TableField("`type`")
+    private Byte type;
+
+    /**
+     * 图标
+     */
+    @Length(max = 50, message = "图标长度不能超过50个字")
+    private String icon;
+
+    /**
+     * 规则附加条件
+     */
+    @TableField("`condition`")
+    private String condition;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注不能超过200字")
+    private String remark;
+
+    /**
+     * 状态：1显示 2隐藏
+     */
+    @TableField("`status`")
+    private Byte status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+
+    public Map<Integer,String> getStatusList() {
+        Map<Integer,String> map = new HashMap<>(2);
+        map.put(1,"显示");
+        map.put(2,"隐藏");
+        return map;
+    }
+}

src/main/java/com/taauav/admin/entity/SysCity.java

@@ -0,0 +1,105 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 城市表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sys_city")
+public class SysCity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 父级ID
+     */
+    private Integer pid;
+
+    /**
+     * 层级：1省 2市 3区
+     */
+    private Boolean level;
+
+    /**
+     * 省市区名称
+     */
+    private String name;
+
+    /**
+     * 简称
+     */
+    private String simple;
+
+    /**
+     * 拼音
+     */
+    private String pinyin;
+
+    /**
+     * 简拼
+     */
+    private String code;
+
+    /**
+     * 首字母
+     */
+    private String firstChar;
+
+    /**
+     * 原城市ID
+     */
+    private Integer oldCityId;
+
+    /**
+     * 有无子级：1有 2无
+     */
+    private Boolean hasChild;
+
+    /**
+     * 显示顺序
+     */
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Boolean mark;
+
+
+}

src/main/java/com/taauav/admin/entity/SysConfig.java

@@ -0,0 +1,191 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 系统配置表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 变量名
+     */
+    @TableField("`name`")
+    @NotNull(message = "配置名称不能为空")
+    @Length(min = 2, max = 50, message = "配置名称长度为2-50个字")
+    private String name;
+
+    /**
+     * 分组
+     */
+    @TableField("`group`")
+    @NotNull(message = "请选择配置分组")
+    private Byte group;
+
+    /**
+     * 变量标题
+     */
+    @NotNull(message = "配置标题不能为空")
+    @Length(min = 2, max = 50, message = "配置标题长度为2-50个字")
+    private String title;
+
+    /**
+     * 变量描述
+     */
+    @Length(max = 100, message = "配置描述不能超过100字")
+    private String tip;
+
+    /**
+     * 类型：string,text,int,bool,array,datetime,date,file
+     */
+    @TableField("`type`")
+    @NotNull(message = "请选择配置类型")
+    private String type;
+
+    /**
+     * 输入类型
+     */
+    @NotNull(message = "请选择输入类型")
+    private String inputType;
+
+    /**
+     * 变量值
+     */
+    @TableField("`value`")
+    @NotNull(message = "配置值不能为空")
+    private String value;
+
+    /**
+     * 变量字典数据
+     */
+    @NotNull(message = "字典数据不能为空")
+    private String content;
+
+    /**
+     * 验证规则
+     */
+    @Length(max = 100, message = "验证规则不能超过100字")
+    private String rule;
+
+    /**
+     * 扩展属性
+     */
+    @TableField("`extend`")
+    private String extend;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注不能超过200字")
+    private String remark;
+
+    /**
+     * 状态：1正常 2禁用
+     */
+    @TableField("`status`")
+    @NotNull(message = "请选择状态")
+    private Byte status;
+
+    /**
+     * 排序
+     */
+    @TableField("`sort`")
+    @NotNull(message = "请填写排序")
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    /**
+     * 获取字段类型配置
+     * @return
+     */
+    public Map<String, String> getTypeList() {
+        Map<String, String> typeList = new HashMap<>();
+        typeList.put("string", "string");
+        typeList.put("text", "text");
+        typeList.put("int", "int");
+        typeList.put("bool", "bool");
+        typeList.put("array", "array");
+        typeList.put("datetime", "datetime");
+        typeList.put("date", "date");
+        typeList.put("file", "file");
+        return typeList;
+    }
+
+    /**
+     * 获取输入类型配置
+     * @return
+     */
+    public Map<String, String> getInputTypeList() {
+        Map<String, String> inputTypeList = new HashMap<>();
+        inputTypeList.put("text", "文本");
+        inputTypeList.put("textarea", "文本域");
+        inputTypeList.put("switch", "开关");
+        inputTypeList.put("radio", "单选按钮");
+        inputTypeList.put("checkbox", "复选框");
+        inputTypeList.put("select", "下拉框");
+        return inputTypeList;
+    }
+
+    /**
+     * 获取状态配置
+     * @return
+     */
+    public Map<Integer, String> getStatusList() {
+        Map<Integer, String> statusList = new HashMap<>();
+        statusList.put(1, "正常");
+        statusList.put(2, "禁用");
+        return statusList;
+    }
+}

src/main/java/com/taauav/admin/entity/SysDep.java

@@ -0,0 +1,98 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 部门管理表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysDep implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 部门名称
+     */
+    @NotEmpty(message = "部门名称不能为空")
+    @Length(min = 2, max = 20, message = "部门名称长度为2-20个字")
+    private String name;
+
+    /**
+     * 直接上级ID
+     */
+    private Integer pid;
+
+    /**
+     * 部门层级
+     */
+    private Byte level;
+
+    /**
+     * 有无子节点：1有 2无
+     */
+    @TableField("has_child")
+    private Byte hasChild;
+
+    /**
+     * 部门主管
+     */
+    private Integer manager;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    @TableField("create_user")
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    @TableField("update_user")
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+
+}

src/main/java/com/taauav/admin/entity/SysDict.java

@@ -0,0 +1,127 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 系统字典表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysDict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @NotEmpty(message = "名称不能为空")
+    @TableField("`name`")
+    @Length(min = 2, max = 50, message = "名称长度为2-50个字")
+    private String name;
+
+    /**
+     * 标识名
+     */
+    @NotEmpty(message = "标识名不能为空")
+    @Length(min = 2, max = 50, message = "标识名长度为2-50个字")
+    private String nid;
+
+    /**
+     * 直接上级ID
+     */
+    private Integer pid;
+
+    /**
+     * 层级
+     */
+    private Byte level;
+
+    /**
+     * 有无子级：1有 2无
+     */
+    @NotNull(message = "请选择有无子类")
+    @TableField("`has_child`")
+    private Byte hasChild;
+
+    /**
+     * 分类ID
+     */
+    @NotNull(message = "请选择分类")
+    @TableField("`type_id`")
+    private Integer typeId;
+
+    /**
+     * 参数值
+     */
+    @TableField("`value`")
+    @Length(max = 1000, message = "参数值长度不能超过1000字")
+    private String value;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注长度不能超过200字")
+    private String remark;
+
+    /**
+     * 状态：1正常 2禁用
+     */
+    @NotNull(message = "请选择状态")
+    @TableField("`status`")
+    private Byte status;
+
+    /**
+     * 排序
+     */
+    @TableField("`sort`")
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+
+}

src/main/java/com/taauav/admin/entity/SysDictType.java

@@ -0,0 +1,83 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 系统字典分类表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysDictType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @TableField("`name`")
+    @NotNull(message = "分类名称不能为空")
+    @Length(min = 2, max = 20, message = "分类名称长度为2-20个字")
+    private String name;
+
+    /**
+     * 标识符
+     */
+    @NotNull(message = "标识符不能为空")
+    @Length(min = 1, max = 50, message = "标识符不能超过50字")
+    private String nid;
+
+    /**
+     * 排序
+     */
+    @TableField("`sort`")
+    @NotNull(message = "排序值不能为空")
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+
+}

src/main/java/com/taauav/admin/entity/SysLevel.java

@@ -0,0 +1,88 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+/**
+ * <p>
+ * 职级管理表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysLevel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 职级名称
+     */
+    @NotNull(message = "职级名称不能为空")
+    @Length(min = 2, max = 10, message = "职级名称长度为2-10个字")
+    private String name;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注不能超过200字")
+    private String remark;
+
+    /**
+     * 状态：1正常 2禁用
+     */
+    @NotNull(message = "状态不能为空")
+    private Byte status;
+
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序不能为空")
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+
+}

src/main/java/com/taauav/admin/entity/SysPosition.java

@@ -0,0 +1,91 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 职位表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysPosition implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @NotEmpty(message = "名称不能为空")
+    @Length(min = 2, max = 10, message = "名称长度为2-10个字")
+    private String name;
+
+    /**
+     * 职位级别
+     */
+    private Integer level;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注不能超过200字")
+    private String remark;
+
+    /**
+     * 状态：1正常 2禁用
+     */
+    @NotNull(message = "状态不能为空")
+    private Byte status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+
+}

src/main/java/com/taauav/admin/entity/TauvDriver.java

@@ -0,0 +1,145 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.*;
+import javax.websocket.ClientEndpoint;
+
+/**
+ * <p>
+ * 河道管理表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tauv_driver")
+public class TauvDriver implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 河道名称
+     */
+    @NotEmpty(message = "河道名称不能为空")
+    @Length(min = 2, max = 20, message = "河道名称长度为2-20个字")
+    private String name;
+
+    /**
+     * 河道类型：1河流 2水库 3湖泊 4重点塘坝
+     */
+    @NotNull(message = "请选择河道类型")
+    private Byte type;
+
+    /**
+     * 河道长度(单位：km)
+     */
+    @NotEmpty(message = "长度不能为空")
+    private String length;
+
+    /**
+     * 是否省/国考河道：1是 2否
+     */
+    private Byte isExam;
+
+    /**
+     * 起点
+     */
+    @Length(max = 20, message = "起点长度不能超过20个字")
+    private String startPoint;
+
+    /**
+     * 终点
+     */
+    @Length(max = 20, message = "终点长度不能超过20个字")
+    private String endPoint;
+
+    /**
+     * 国考河道长度(单位：km)
+     */
+    private String examLength;
+
+    /**
+     * 河道所属区域
+     */
+    private Integer driverArea;
+
+    /**
+     * 状态：1正常 2停用
+     */
+    private Byte status;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    /**
+     * 河流类型
+     * @return
+     */
+    public Map<Integer,String> getTypeList() {
+        Map<Integer,String> map = new HashMap<>(4);
+        map.put(1,"河流");
+        map.put(2,"水库");
+        map.put(3,"湖泊");
+        map.put(4,"重点塘坝");
+        return map;
+    }
+
+    /**
+     * 是否省/国考河道
+     * @return
+     */
+    public Map<Integer,String> getExamList() {
+        Map<Integer,String> map = new HashMap<>(2);
+        map.put(1,"是");
+        map.put(2,"否");
+        return map;
+    }
+
+    /**
+     * 状态
+     * @return
+     */
+    public Map<Integer,String> getStatusList() {
+        Map<Integer,String> map = new HashMap<>(2);
+        map.put(1,"正常");
+        map.put(2,"停用");
+        return map;
+    }
+}

src/main/java/com/taauav/admin/entity/TauvEquipment.java

@@ -0,0 +1,123 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * <p>
+ * 设备管理表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvEquipment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @TableId(value = "id",type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 产品序号
+     */
+    @NotEmpty(message = "产品序号不能空")
+    @Length(min = 2, max = 150, message = "产品序号长度为2-150个字")
+    private String productSn;
+
+    /**
+     * 飞控序号
+     */
+    @Length(max = 150, message = "飞控序号长度不能超过150个字")
+    private String flightSn;
+
+    /**
+     * 无人机登记号
+     */
+    @Length(max = 150, message = "无人机登记号长度不能超过150个字")
+    private String droneNum;
+
+    /**
+     * 设备名称
+     */
+    @NotEmpty(message = "设备名称不能为空")
+    @Length(min = 2, max = 20, message = "设备名称长度为2-20个字")
+    private String name;
+
+    /**
+     * 品牌
+     */
+    @Length(max = 100, message = "品牌长度不能超过100个字")
+    private String brand;
+
+    /**
+     * 型号
+     */
+    @Length(max = 100, message = "型号长度不能超过100个字")
+    private String model;
+
+    /**
+     * 类型：1多旋翼 2固定翼
+     */
+    private Byte type;
+
+    /**
+     * 注册时间
+     */
+    private Integer registerTime;
+
+    /**
+     * 状态：1正常 2停用
+     */
+    private Byte status;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    public Map<Integer,String> getStatusList() {
+        Map<Integer,String> map = new HashMap<>();
+        map.put(1,"正常");
+        map.put(2,"停用");
+        return map;
+    }
+
+    public Map<Integer,String> getTypeList() {
+        Map<Integer,String> map = new HashMap<>();
+        map.put(1,"多旋翼");
+        map.put(2,"固定翼");
+        return map;
+    }
+}

src/main/java/com/taauav/admin/entity/TauvInspect.java

@@ -0,0 +1,145 @@
+package com.taauav.admin.entity;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.*;
+
+/**
+ * <p>
+ * 巡检任务表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvInspect implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 巡检任务单号
+     */
+    private String inspectNo;
+
+    /**
+     * 类型：1日常任务 2周期性任务
+     */
+    @NotNull(message = "巡检类型不能为空")
+    private Byte type;
+
+    /**
+     * 巡检目的
+     */
+    @NotNull(message = "巡检目的不能为空")
+    @Size(min = 1, max = 200, message = "巡检目的字数长度为1-200")
+    private String inspectPurpose;
+
+    /**
+     * 巡检开始时间
+     */
+    private Integer inspectStartTime;
+
+    /**
+     * 巡检结束时间
+     */
+    private Integer inspectEndTime;
+
+    /**
+     * 实际执行时间
+     */
+    private Integer executionTime;
+
+    /**
+     * 执行周期（如：每月10号）
+     */
+    private String executionCycle;
+
+    /**
+     * 巡检总长(单位：KM)
+     */
+    @NotNull(message = "巡检总长度不能为空")
+    private BigDecimal inspectLength;
+
+    /**
+     * 巡检期望结果
+     */
+    private String inspectResult;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+    /**
+     * 河道任务
+     */
+    @TableField(exist = false)
+    private List<TauvInspectDriver> inspectDriverList;
+
+    /**
+     * 类型数组
+     * @return
+     */
+    public Map<Integer,String> getTypeList() {
+        Map<Integer,String> map = new HashMap<>(2);
+        map.put(1, "日常任务");
+        map.put(2, "周期任务");
+        return map;
+    }
+
+    /**
+     * 状态数组
+     * @return
+     */
+    public Map<Integer, String> getStatusList() {
+        Map<Integer, String> map = new HashMap<>(5);
+        map.put(2, "待执行");
+        map.put(3, "执行中");
+        map.put(4, "已完成");
+        map.put(5, "复核中");
+        map.put(6, "复核完成");
+        return map;
+    }
+}

src/main/java/com/taauav/admin/entity/TauvInspectDriver.java

@@ -0,0 +1,191 @@
+package com.taauav.admin.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * <p>
+ * 巡检任务河道表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvInspectDriver implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 巡检任务ID
+     */
+    private Integer inspectId;
+
+    /**
+     * 行号(以10的倍数递增)
+     */
+    private Integer num;
+
+    /**
+     * 巡检任务单号对应的河流子编号
+     */
+    private String inspectNo;
+
+    /**
+     * 河道ID
+     */
+    @NotEmpty(message = "河道编号不能为空")
+    private Integer driverId;
+
+    /**
+     * 河流名称
+     */
+    @NotEmpty(message = "河流名称不为空")
+    private String driverName;
+
+    /**
+     * 河流区域ID
+     */
+    @NotEmpty(message = "河流区域不能为空")
+    private Integer driverArea;
+
+    /**
+     * 河流长度(单位：KM)
+     */
+    @NotEmpty(message = "河流长度不能为空")
+    private BigDecimal driverLength;
+
+    /**
+     * 河流起点
+     */
+    @NotEmpty(message = "河流起点不能为空")
+    private String driverStart;
+
+    /**
+     * 河流终点
+     */
+    @NotEmpty(message = "河流终点不能为空")
+    private String driverEnd;
+
+    /**
+     * 河流位置
+     */
+    private String driverImage;
+
+    /**
+     * 河流备注
+     */
+    private String driverNote;
+
+    /**
+     * 是否省/国考河道：1是 2否
+     */
+    private Byte driverExam;
+
+    /**
+     * 飞行小组
+     */
+    private Integer flightGroup;
+
+    /**
+     * 执行开始时间
+     */
+    private Integer executionStartTime;
+
+    /**
+     * 执行结束时间
+     */
+    private Integer executionEndTime;
+
+    /**
+     * 天气
+     */
+    private String weather;
+
+    /**
+     * 风向
+     */
+    private String wind;
+
+    /**
+     * 温度
+     */
+    private String temperature;
+
+    /**
+     * 飞行速度
+     */
+    private BigDecimal flightSpeed;
+
+    /**
+     * 飞行时长
+     */
+    private BigDecimal flightTime;
+
+    /**
+     * 飞行高度
+     */
+    private BigDecimal flightHeight;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 状态：1待分配 2待执行 3执行中 4已完成 5复核中 6复核完成
+     */
+    private Byte status;
+    /**
+     * 复核人
+     */
+    private Integer reviewUser;
+    /**
+     * 复核时间
+     */
+    private Integer reviewTime;
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+}

src/main/java/com/taauav/admin/entity/TauvInspectFile.java

@@ -0,0 +1,195 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 巡检附件表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvInspectFile implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 巡检任务ID
+     */
+    private Integer inspectId;
+
+    /**
+     * 巡检河流ID
+     */
+    private Integer inspectDriverId;
+
+    /**
+     * 日期
+     */
+    @TableField("`date`")
+    private String date;
+
+    /**
+     * 文件归类
+     */
+    @TableField("`file_document`")
+    private String fileDocument;
+
+    /**
+     * 附件类型：1图片 2视频
+     */
+    private Byte fileType;
+
+    /**
+     * 文件类型：文件夹/文件
+     */
+    @TableField("`type`")
+    private String type;
+
+    /**
+     * 文件名称
+     */
+    @TableField("`name`")
+    private String name;
+
+    /**
+     * 文件后缀
+     */
+    private String extension;
+
+    /**
+     * 附件地址
+     */
+    private String src;
+
+    /**
+     * 缩略图
+     */
+    private String thumbImg;
+
+    /**
+     * 原图
+     */
+    private String originalImg;
+
+    /**
+     * 文件大小
+     */
+    private Integer size;
+
+    /**
+     * 原始文件名
+     */
+    private String fileName;
+
+    /**
+     * md5加密
+     */
+    private String md5;
+
+    /**
+     * 经度(地里坐标)
+     */
+    private String latitude;
+
+    /**
+     * 纬度(地里坐标)
+     */
+    private String longitude;
+
+    /**
+     * 位置信息
+     */
+    private String location;
+
+    private String baiduLatitude;
+    private String baiduLongitude;
+    private String baiduAddress;
+
+    private String gaodeLatitude;
+    private String gaodeLongitude;
+    private String gaodeAddress;
+
+    /**
+     * 问题类型ID
+     */
+    private Integer questionId;
+
+    /**
+     * 详细描述
+     */
+    private String description;
+
+    /**
+     * 是否已复核 1是 2否
+     */
+    private Byte isReview;
+    /**
+     * 是否有效：1是 2否
+     */
+    private Byte isEffective;
+
+    /**
+     * 是否已标记：1是 2否
+     */
+    @TableField("`status`")
+    private Byte status;
+
+    /**
+     * 坐标检查：1处理成功 2待处理 3处理失败
+     */
+    private Byte checkStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    public Map<String,String> getFileDocumentList() {
+        Map<String,String> map = new HashMap<>(4);
+        map.put("surfaceWater","水面");
+        map.put("shoreLine","岸线");
+        map.put("outfall","排口");
+        map.put("waterQuality","水质");
+        return map;
+    }
+}

src/main/java/com/taauav/admin/entity/TauvInspectFileBak.java

@@ -0,0 +1,175 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 巡检附件表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvInspectFileBak implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 巡检任务ID
+     */
+    private Integer inspectId;
+
+    /**
+     * 巡检河流ID
+     */
+    private Integer inspectDriverId;
+
+    /**
+     * 日期
+     */
+    private String date;
+
+    /**
+     * 上级ID
+     */
+    private Integer pid;
+
+    /**
+     * 附件类型：1图片 2视频
+     */
+    private Byte fileType;
+
+    /**
+     * 文件类型：文件夹/文件
+     */
+    private String type;
+
+    /**
+     * 文件名称
+     */
+    private String name;
+
+    /**
+     * 文件后缀
+     */
+    private String extension;
+
+    /**
+     * 附件地址
+     */
+    private String src;
+
+    /**
+     * 缩略图
+     */
+    private String thumbImg;
+
+    /**
+     * 原图
+     */
+    private String originalImg;
+
+    /**
+     * 文件大小
+     */
+    private Integer size;
+
+    /**
+     * 原始文件名
+     */
+    private String fileName;
+
+    /**
+     * 经度(地里坐标)
+     */
+    private String latitude;
+
+    /**
+     * 纬度(地里坐标)
+     */
+    private String longitude;
+
+    /**
+     * 位置信息
+     */
+    private String location;
+
+    private String baiduLatitude;
+    private String baiduLongitude;
+    private String baiduAddress;
+
+    private String gaodeLatitude;
+    private String gaodeLongitude;
+    private String gaodeAddress;
+
+    /**
+     * 问题类型ID
+     */
+    private Integer questionId;
+
+    /**
+     * 详细描述
+     */
+    private String description;
+
+    /**
+     * 是否已复核：1是 2否
+     */
+    private Byte isReview;
+
+    /**
+     * 是否有效：1是 2否
+     */
+    private Byte isEffective;
+
+    /**
+     * 是否已标记：1是 2否
+     */
+    private Byte status;
+
+    /**
+     * 坐标检查：1处理成功 2待处理 3处理失败
+     */
+    private Byte checkStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+
+}

src/main/java/com/taauav/admin/entity/TauvQuestionOptions.java

@@ -0,0 +1,145 @@
+package com.taauav.admin.entity;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * <p>
+ * 问题选项管理表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvQuestionOptions implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 分类：1水面 2岸线 3排口 4水质
+     */
+    @NotNull(message = "请选项分类")
+    private Byte category;
+
+    /**
+     * 类型：1日常监测 2重点核查
+     */
+    @NotNull(message = "请选择类型")
+    private Byte type;
+
+    /**
+     * 问题选项
+     */
+    @NotEmpty(message = "问题描述不能为空")
+    @Length(min = 2, max = 200, message = "问题描述长度为2-200字")
+    private String content;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注长度不能超过200字")
+    private String note;
+
+    /**
+     * 基础分值
+     */
+    @NotNull(message = "基础分值不能为空")
+    @Max(value = 99, message = "最大基础分值不能超过99")
+    @Min(value = 0, message = "最小基础分值不能小于0")
+    private Integer baseScore;
+
+    /**
+     * 国考基础分值
+     */
+    @NotNull(message = "国考基础分值不能为空")
+    @Max(value = 99, message = "最大国考基础分值不能超过99")
+    @Min(value = 0, message = "最小国考基础分值不能小于0")
+    private Integer examBaseScore;
+
+    /**
+     * 没增加问题数量
+     */
+    private Integer increaseNum;
+
+    /**
+     * 扣分
+     */
+    private Integer deduction;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态1：启用、2：禁用
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    public Map<Integer,String> getStatusList() {
+        Map<Integer,String> map = new HashMap<>(2);
+        map.put(1,"正常");
+        map.put(2,"禁用");
+        return map;
+    }
+
+    public Map<Integer,String> getCategoryList() {
+        Map<Integer,String> map = new HashMap<>(4);
+        map.put(1,"水面");
+        map.put(2,"岸线");
+        map.put(3,"排口");
+        map.put(4,"水质");
+        return map;
+    }
+
+    public Map<Integer,String> getTypeList() {
+        Map<Integer,String> map = new HashMap<>(2);
+        map.put(1,"日常监测");
+        map.put(2,"重点检查");
+        return map;
+    }
+
+}

src/main/java/com/taauav/admin/entity/TauvReport.java

@@ -0,0 +1,236 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 巡检报告表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvReport implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 报告编号
+     */
+    private String reportNo;
+
+    /**
+     * 巡检任务ID
+     */
+    private Integer inspectId;
+
+    /**
+     * 飞行小组编号
+     */
+    private Integer flightGroup;
+
+    /**
+     * 巡检河道ID
+     */
+    private Integer inspectDriverId;
+
+    /**
+     * 任务单号
+     */
+    private String inspectNo;
+
+    private Integer num;
+    /**
+     * 任务名称
+     */
+    private String inspectName;
+
+    /**
+     * 河流名称
+     */
+    private String driverName;
+
+    /**
+     * 河流区域ID
+     */
+    private Integer driverArea;
+    @TableField(exist = false)
+    private String driverAreaText;
+    /**
+     * 河流起点
+     */
+    private String driverStart;
+
+    /**
+     * 河流终点
+     */
+    private String driverEnd;
+
+    /**
+     * 是否省/国考河道：1是 2否
+     */
+    private Byte driverExam;
+
+    /**
+     * 巡检总长
+     */
+    private String inspectLength;
+
+    /**
+     * 巡检开始时间
+     */
+    private Integer inspectStartTime;
+    @TableField(exist = false)
+    private String formatInspectStartTime;
+    /**
+     * 巡检结束时间
+     */
+    private Integer inspectEndTime;
+
+    /**
+     * 巡检时间
+     */
+    private Integer executionTime;
+
+    /**
+     * 原始视频地址
+     */
+    private String originalVideoUrl;
+
+    /**
+     * 视频地址
+     */
+    private String videoUrl;
+    @TableField(exist = false)
+    private String formatVideoUrl;
+
+    /**
+     * 正视图地址
+     */
+    private String imageUrl;
+    @TableField(exist = false)
+    private String formatImageUrl;
+    /**
+     * 电子报告地址
+     */
+    private String reportUrl;
+
+    /**
+     * 群众满意度(考核分)
+     */
+    private Integer manyiExamineScore;
+
+    /**
+     * 群众满意度(校核分)
+     */
+    private Integer manyiCheckScore;
+
+    /**
+     * 知晓率得分(考核分)
+     */
+    private Integer awareExamineScore;
+
+    /**
+     * 知晓率得分(校核分)
+     */
+    private Integer awareCheckScore;
+
+    /**
+     * 考核分
+     */
+    private Integer totalExamineScore;
+
+    /**
+     * 校核分
+     */
+    private Integer totalCheckScore;
+
+    /**
+     * 巡检任务状态：1待生成 2审核中 3审核通过 4审核驳回
+     */
+    @TableField(value = "`status`")
+    private Byte status;
+
+    /**
+     * 报告描述
+     */
+    @TableField(value = "`desc`")
+    private String desc;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 创建人
+     */
+    private Integer inputUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer inputTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    /**
+     * 是否省/国考
+     * @return
+     */
+    public Map<Integer, String> getDriverExamList() {
+        Map<Integer, String> map = new HashMap<>(2);
+        map.put(1, "是");
+        map.put(2, "否");
+        return map;
+    }
+
+    /**
+     * 状态数组
+     * @return
+     */
+    public Map<Integer, String> getStatusList() {
+        Map<Integer, String> map = new HashMap<>(5);
+        map.put(1, "待生成");
+        map.put(2, "审核中");
+        map.put(3, "审核通过");
+        map.put(4, "审核驳回");
+        return map;
+    }
+}

src/main/java/com/taauav/admin/entity/TauvReportCheck.java

@@ -0,0 +1,59 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvReportCheck implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 报告编号
+     */
+    private Integer reportId;
+
+    /**
+     * 审批意见
+     */
+    private String remark;
+
+    /**
+     * 3.通过 4.驳回
+     */
+    private Byte status;
+
+    /**
+     * 审核人编号
+     */
+    private Integer checkUser;
+    @TableField(exist = false)
+    private String formatCheckUser;
+
+    private Integer createTime;
+    @TableField(exist = false)
+    private String formatCreateTime;
+    private Integer updateTime;
+
+    private Byte mark;
+
+
+}

src/main/java/com/taauav/admin/entity/TauvReportEvaluation.java

@@ -0,0 +1,92 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * <p>
+ * 报告描述(评价)内容管理表
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvReportEvaluation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 评价内容
+     */
+    @NotEmpty(message = "请输入评价数据")
+    @Length(min = 2, max = 200, message = "评价内容长度为2-200字")
+    private String content;
+
+    /**
+     * 备注
+     */
+    @Length(max = 200, message = "备注长度不能超过200字")
+    private String note;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态1：启用、2：禁用
+     */
+    private Integer status;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 创建时间
+     */
+    private Integer createTime;
+
+    /**
+     * 更新时间
+     */
+    private Integer updateTime;
+
+    /**
+     * 有效标记
+     */
+    private Byte mark;
+
+    public Map<Integer,String> getStatusList() {
+        Map<Integer,String> map = new HashMap<>(2);
+        map.put(1,"正常");
+        map.put(1,"禁用");
+        return map;
+    }
+
+}

src/main/java/com/taauav/admin/entity/TauvReportRemark.java

@@ -0,0 +1,60 @@
+package com.taauav.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TauvReportRemark implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 报告表编号
+     */
+    private Integer reportId;
+
+    /**
+     * 问题表编号
+     */
+    private Integer questionId;
+
+    /**
+     * 考核分
+     */
+    private Integer examineScore;
+
+    /**
+     * 校核分
+     */
+    private Integer checkScore;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private Integer createTime;
+
+    private Integer updateTime;
+
+    private Boolean mark;
+
+
+}

src/main/java/com/taauav/admin/mapper/CtAdMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.CtAd;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 广告表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-06
+ */
+public interface CtAdMapper extends BaseMapper<CtAd> {
+
+}

src/main/java/com/taauav/admin/mapper/CtAdMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.CtAdMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/SysAdminMapper.java

@@ -0,0 +1,19 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysAdmin;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 管理员表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+public interface SysAdminMapper extends BaseMapper<SysAdmin> {
+    List<Map<String,Object>> selectListByGroupId(Integer groupId);
+}

src/main/java/com/taauav/admin/mapper/SysAdminMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysAdminMapper">
+    <select id="selectListByGroupId" resultType="java.util.Map">
+        select id,username,realname from sys_admin where find_in_set(auth_group,#{groupId}) and mark=1
+    </select>
+</mapper>

src/main/java/com/taauav/admin/mapper/SysAuthGroupAccessMapper.java

@@ -0,0 +1,21 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysAuthGroup;
+import com.taauav.admin.entity.SysAuthGroupAccess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 用户组明细表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+public interface SysAuthGroupAccessMapper extends BaseMapper<SysAuthGroupAccess> {
+
+
+
+}

src/main/java/com/taauav/admin/mapper/SysAuthGroupAccessMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysAuthGroupAccessMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/SysAuthGroupMapper.java

@@ -0,0 +1,31 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysAuthGroup;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户组表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+public interface SysAuthGroupMapper extends BaseMapper<SysAuthGroup> {
+    /**
+     * 根据用户编号获取权限
+     * @param adminId
+     * @return
+     */
+    List<SysAuthGroup> getAuthGroups(Integer adminId);
+
+    /**
+     * 根据父级编号获取数据
+     * @param pid
+     * @return
+     */
+    List<Map<String,String>> getListByPid(Integer pid);
+}

src/main/java/com/taauav/admin/mapper/SysAuthGroupMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysAuthGroupMapper">
+<select id="getAuthGroups" resultType="com.taauav.admin.entity.SysAuthGroup">
+    select g.*  from sys_auth_group_access gc left join sys_auth_group g on gc.group_id=g.id
+    where gc.uid=#{adminId}  and g.mark=1
+</select>
+
+<select id="getListByPid" resultType="java.util.Map">
+    select  id,`name`,pid,`status`,sort,remark from sys_auth_group where
+    pid=#{pid} and mark=1
+</select>
+</mapper>

src/main/java/com/taauav/admin/mapper/SysAuthRuleMapper.java

@@ -0,0 +1,23 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysAuthRule;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 权限规则表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-04
+ */
+public interface SysAuthRuleMapper extends BaseMapper<SysAuthRule> {
+    /**
+     * 根据ids获取权限
+     * @param ids
+     * @return
+     */
+    List<SysAuthRule> getRulesByIds(String[] ids);
+}

src/main/java/com/taauav/admin/mapper/SysAuthRuleMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysAuthRuleMapper">
+    <select id="getRulesByIds" parameterType="com.taauav.admin.entity.SysAuthRule">
+        select  * from sys_auth_rule
+        where id in
+        <foreach collection="ids" open="(" close=")" separator="," item="id"></foreach>
+        and mark=1
+    </select>
+</mapper>

src/main/java/com/taauav/admin/mapper/SysCityMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysCity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 城市表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-13
+ */
+public interface SysCityMapper extends BaseMapper<SysCity> {
+
+}

src/main/java/com/taauav/admin/mapper/SysCityMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysCityMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/SysConfigMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统配置表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-12
+ */
+public interface SysConfigMapper extends BaseMapper<SysConfig> {
+
+}

src/main/java/com/taauav/admin/mapper/SysConfigMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysConfigMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/SysDepMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysDep;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 部门管理表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-07
+ */
+public interface SysDepMapper extends BaseMapper<SysDep> {
+
+}

src/main/java/com/taauav/admin/mapper/SysDepMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysDepMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/SysDictMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysDict;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统字典表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+public interface SysDictMapper extends BaseMapper<SysDict> {
+
+}

src/main/java/com/taauav/admin/mapper/SysDictMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysDictMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/SysDictTypeMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysDictType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统字典分类表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+public interface SysDictTypeMapper extends BaseMapper<SysDictType> {
+
+}

src/main/java/com/taauav/admin/mapper/SysDictTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysDictTypeMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/SysLevelMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysLevel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 职级管理表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-11
+ */
+public interface SysLevelMapper extends BaseMapper<SysLevel> {
+
+}

src/main/java/com/taauav/admin/mapper/SysLevelMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysLevelMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/SysPositionMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.SysPosition;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 职位表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-12
+ */
+public interface SysPositionMapper extends BaseMapper<SysPosition> {
+
+}

src/main/java/com/taauav/admin/mapper/SysPositionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.SysPositionMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/TauvDriverMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.TauvDriver;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 河道管理表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-12
+ */
+public interface TauvDriverMapper extends BaseMapper<TauvDriver> {
+
+}

src/main/java/com/taauav/admin/mapper/TauvDriverMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.TauvDriverMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/TauvEquipmentMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.TauvEquipment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备管理表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-13
+ */
+public interface TauvEquipmentMapper extends BaseMapper<TauvEquipment> {
+
+}

src/main/java/com/taauav/admin/mapper/TauvEquipmentMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.TauvEquipmentMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/TauvInspectDriverMapper.java

@@ -0,0 +1,29 @@
+package com.taauav.admin.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.taauav.admin.dto.TauvInspectDriverDTO;
+import com.taauav.admin.dto.TauvInspectDriverPicDTO;
+import com.taauav.admin.entity.TauvInspectDriver;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import javafx.scene.control.Pagination;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 巡检任务河道表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+public interface TauvInspectDriverMapper extends BaseMapper<TauvInspectDriver> {
+
+    List<TauvInspectDriverDTO> getPageList(Page<TauvInspectDriverDTO> page, @Param("param") Map<String,Object> param);
+
+    List<TauvInspectDriverPicDTO> getFilePageList(IPage<TauvInspectDriverPicDTO> page, @Param("param") Map<String,Object> param);
+}

src/main/java/com/taauav/admin/mapper/TauvInspectDriverMapper.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.TauvInspectDriverMapper">
+
+    <select id="getPageList" parameterType="java.util.Map" resultType="com.taauav.admin.dto.TauvInspectDriverDTO">
+        select driver.* ,inspect.type,inspect.inspect_start_time,inspect.inspect_end_time,inspect.execution_cycle,inspect.inspect_length
+          from  tauv_inspect_driver driver left join tauv_inspect inspect on driver.inspect_id=inspect.id
+        where driver.mark=1
+        <if test="param.type != null and param.type >0">
+            and inspect.type = #{param.type}
+        </if>
+        <if test="param.inspectNo != null and param.inspectNo !=''">
+            and driver.inspect_no like CONCAT('%',#{param.inspectNo},'%')
+        </if>
+        <if test="param.driverName != null and param.driverName!=''">
+            and driver.driver_name like CONCAT('%',#{param.driverName},'%')
+        </if>
+        <if test="param.driverArea != null and param.driverArea != ''">
+            and driver.driver_area in
+            <foreach collection="param.driverArea" item="driver" separator="," open="(" close=")">
+                #{driver}
+            </foreach>
+        </if>
+        <if test="param.executionTime != null and param.executionTime != ''">
+            and driver.execution_start_time >= #{param.executionTime}
+        </if>
+        <if test="param.inspectStartTime != null and param.inspectStartTime != ''">
+            and inspect.inspect_start_time >= #{param.inspectStartTime}
+        </if>
+        <if test="param.flightGroup != null and param.flightGroup != ''">
+            and driver.flight_group = #{param.flightGroup}
+        </if>
+        <if test="param.status != null and param.status != '' ">
+            and driver.status in
+            <foreach collection="param.status" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+
+        </if>
+        <if test="param.allocation != null and param.allocation>0">
+            and driver.flight_group > 0
+        </if>
+        <if test="param.driverExam != null and param.driverExam > 0">
+            and driver.driver_exam = #{param.driverExam}
+        </if>
+        order by driver.status asc, driver.inspect_id desc, driver.num asc
+    </select>
+
+    <select id="getFilePageList" parameterType="java.util.Map" resultType="com.taauav.admin.dto.TauvInspectDriverPicDTO">
+        select *
+        from  tauv_inspect_driver
+        where mark=1
+        <if test="param.inspectNo != null and param.inspectNo !=''">
+            and inspect_no like CONCAT('%',#{param.inspectNo},'%')
+        </if>
+        <if test="param.driverName != null and param.driverName!=''">
+            and driver_name like CONCAT('%',#{param.driverName},'%')
+        </if>
+        <if test="param.driverArea != null and param.driverArea != ''">
+            and driver_area in
+            <foreach collection="param.driverArea" item="area" open="(" close=")" separator=",">
+                #{area}
+            </foreach>
+        </if>
+
+        <if test="param.status != null and param.status != '' ">
+            and status in
+            <foreach collection="param.status" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+
+        </if>
+        <if test="param.flightGroup != null and param.flightGroup>0">
+            and flight_group = #{param.flightGroup}
+        </if>
+        <if test="param.startTime !=null and param.endTime != null">
+            and execution_start_time between #{param.startTime} and #{param.endTime}
+        </if>
+        <if test="param.isReview != null and param.isReview>0">
+            and is_review = #{param.isReview}
+        </if>
+        <if test="param.driverExam != null and param.driverExam > 0">
+            and driver_exam = #{param.driverExam}
+        </if>
+        order by status asc,execution_start_time desc,inspect_no desc,num asc,id desc
+    </select>
+</mapper>

src/main/java/com/taauav/admin/mapper/TauvInspectFileBakMapper.java

@@ -0,0 +1,16 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.TauvInspectFileBak;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 巡检附件表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-29
+ */
+public interface TauvInspectFileBakMapper extends BaseMapper<TauvInspectFileBak> {
+
+}

src/main/java/com/taauav/admin/mapper/TauvInspectFileBakMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.TauvInspectFileBakMapper">
+
+</mapper>

src/main/java/com/taauav/admin/mapper/TauvInspectFileMapper.java

@@ -0,0 +1,30 @@
+package com.taauav.admin.mapper;
+
+import com.taauav.admin.entity.TauvInspectFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 巡检附件表 Mapper 接口
+ * </p>
+ *
+ * @author dyg
+ * @since 2019-11-14
+ */
+public interface TauvInspectFileMapper extends BaseMapper<TauvInspectFile> {
+    List<TauvInspectFile> getListByInspectDriverIds(@Param("inspectDriverIds") Integer[] inspectDriverIds);
+    /**
+     * 根据河道类型获取问题图片的数量
+     * @param driverArea
+     * @param inspectDriverId
+     * @param driverExam
+     * @param inspectStartTime
+     * @param inspectEndTime
+     * @return
+     */
+    List<Map<String,Object>> getNumByFileDocument(@Param("driverArea") String[] driverArea, @Param("inspectDriverId") Integer inspectDriverId, @Param("driverExam") Byte driverExam, @Param("inspectStartTime") Integer inspectStartTime, @Param("inspectEndTime") Integer inspectEndTime);
+}

src/main/java/com/taauav/admin/mapper/TauvInspectFileMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.taauav.admin.mapper.TauvInspectFileMapper">
+    <select id="getListByInspectDriverIds" parameterType="java.util.Arrays" resultType="com.taauav.admin.entity.TauvInspectFile">
+        select * from tauv_inspect_file
+        where inspect_driver_id in <foreach collection="inspectDriverIds" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        and mark=1
+    </select>
+
+    <!-- 根据河道编号获取有问题的图片类型数量-->
+    <select id="getNumByFileDocument" resultType="java.util.Map">
+        select count(*) as total_num, a.`file_document` from tauv_inspect_file a left join tauv_report b on a.inspect_driver_id=b.inspect_driver_id
+        where  b.driver_exam=#{driverExam}
+        <if test="driverArea != null and driverArea != ''"> and b.driver_area in
+            <foreach collection="driverArea" item="area" separator="," open="(" close=")">
+                #{area}
+            </foreach>
+        </if>
+        <if test="inspectDriverId !=null and inspectDriverId >0">and b.inspect_driver_id = #{inspectDriverId}</if>
+        <if test="inspectStartTime != null and inspectStartTime > 0 and inspectEndTime != null and inspectEndTime > 0 and inspectEndTime >= inspectStartTime">
+            and b.inspect_start_time between #{inspectStartTime} and #{inspectEndTime}
+        </if>
+            and b.status=3 and a.is_review=1 and
+        a.is_effective=1 and a.file_type = 1 and a.status=1 and a.mark=1 and b.mark=1 group by a.`file_document`
+    </select>
+</mapper>