Merge branch 'logistics' of ssh://101.201.226.163:50022/ccsens_wiki/ccsenscloud into logistics

# Conflicts:
#	tall/src/main/java/com/ccsens/tall/service/InputDocService.java

beneficiation/.gitignore

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

beneficiation/mvnw

@@ -0,0 +1,322 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ]; then
+
+  if [ -f /etc/mavenrc ]; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ]; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+darwin=false
+mingw=false
+case "$(uname)" in
+CYGWIN*) cygwin=true ;;
+MINGW*) mingw=true ;;
+Darwin*)
+  darwin=true
+  # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+  # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+  if [ -z "$JAVA_HOME" ]; then
+    if [ -x "/usr/libexec/java_home" ]; then
+      export JAVA_HOME="$(/usr/libexec/java_home)"
+    else
+      export JAVA_HOME="/Library/Java/Home"
+    fi
+  fi
+  ;;
+esac
+
+if [ -z "$JAVA_HOME" ]; then
+  if [ -r /etc/gentoo-release ]; then
+    JAVA_HOME=$(java-config --jre-home)
+  fi
+fi
+
+if [ -z "$M2_HOME" ]; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ]; do
+    ls=$(ls -ld "$PRG")
+    link=$(expr "$ls" : '.*-> \(.*\)$')
+    if expr "$link" : '/.*' >/dev/null; then
+      PRG="$link"
+    else
+      PRG="$(dirname "$PRG")/$link"
+    fi
+  done
+
+  saveddir=$(pwd)
+
+  M2_HOME=$(dirname "$PRG")/..
+
+  # make it fully qualified
+  M2_HOME=$(cd "$M2_HOME" && pwd)
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=$(cygpath --unix "$M2_HOME")
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="$( (
+      cd "$M2_HOME"
+      pwd
+    ))"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="$( (
+      cd "$JAVA_HOME"
+      pwd
+    ))"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=$(which readlink)
+    if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then
+      if $darwin; then
+        javaHome="$(dirname \"$javaExecutable\")"
+        javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac"
+      else
+        javaExecutable="$(readlink -f \"$javaExecutable\")"
+      fi
+      javaHome="$(dirname \"$javaExecutable\")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ]; then
+  if [ -n "$JAVA_HOME" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="$(which java)"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ]; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]; then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ]; do
+    if [ -d "$wdir"/.mvn ]; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=$(
+        cd "$wdir/.."
+        pwd
+      )
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' <"$1")"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(pwd)")
+if [ -z "$BASE_DIR" ]; then
+  exit 1
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+  if [ "$MVNW_VERBOSE" = true ]; then
+    echo "Found .mvn/wrapper/maven-wrapper.jar"
+  fi
+else
+  if [ "$MVNW_VERBOSE" = true ]; then
+    echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+  fi
+  if [ -n "$MVNW_REPOURL" ]; then
+    jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+  else
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+  fi
+  while IFS="=" read key value; do
+    case "$key" in wrapperUrl)
+      jarUrl="$value"
+      break
+      ;;
+    esac
+  done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+  if [ "$MVNW_VERBOSE" = true ]; then
+    echo "Downloading from: $jarUrl"
+  fi
+  wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+  if $cygwin; then
+    wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+  fi
+
+  if command -v wget >/dev/null; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found wget ... using wget"
+    fi
+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+      wget "$jarUrl" -O "$wrapperJarPath"
+    else
+      wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+    fi
+  elif command -v curl >/dev/null; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found curl ... using curl"
+    fi
+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+      curl -o "$wrapperJarPath" "$jarUrl" -f
+    else
+      curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+    fi
+
+  else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Falling back to using Java to download"
+    fi
+    javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+    # For Cygwin, switch paths to Windows format before running javac
+    if $cygwin; then
+      javaClass=$(cygpath --path --windows "$javaClass")
+    fi
+    if [ -e "$javaClass" ]; then
+      if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo " - Compiling MavenWrapperDownloader.java ..."
+        fi
+        # Compiling the Java class
+        ("$JAVA_HOME/bin/javac" "$javaClass")
+      fi
+      if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+        # Running the downloader
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo " - Running MavenWrapperDownloader.java ..."
+        fi
+        ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+      fi
+    fi
+  fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=$(cygpath --path --windows "$M2_HOME")
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

beneficiation/mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

beneficiation/pom.xml

@@ -0,0 +1,72 @@
+<?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">
+    <parent>
+        <artifactId>ccsenscloud</artifactId>
+        <groupId>com.ccsens</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>beneficiation</artifactId>
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <!--cloud 工具类-->
+        <dependency>
+            <artifactId>cloudutil</artifactId>
+            <groupId>com.ccsens</groupId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!--util 工具类-->
+
+        <dependency>
+            <groupId>com.ccsens</groupId>
+            <artifactId>util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+                <version>1.3.7</version>
+                <configuration>
+                    <configurationFile>${basedir}/src/main/resources/mbg.xml</configurationFile>
+                    <overwrite>true</overwrite>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>5.1.34</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.ccsens.beneficiation.BeneficiationApplication</mainClass>
+                    <!--<skip>true</skip>-->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+
+</project>

beneficiation/src/main/java/com/ccsens/beneficiation/BeneficiationApplication.java

@@ -0,0 +1,27 @@
+package com.ccsens.beneficiation;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * @author 逗
+ */
+@MapperScan(basePackages = {"com.ccsens.beneficiation.persist.*"})
+@ServletComponentScan
+@EnableAsync
+//开启断路器功能
+@EnableCircuitBreaker
+@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
+@SpringBootApplication(scanBasePackages = "com.ccsens")
+public class BeneficiationApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(BeneficiationApplication.class, args);
+    }
+
+}

beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java

@@ -0,0 +1,30 @@
+package com.ccsens.beneficiation.api;
+
+import com.ccsens.util.JsonResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Api(tags = "DEBUG" , description = "DebugController | ")
+@RestController
+@RequestMapping("/debug")
+@Slf4j
+public class DebugController {
+
+    @ApiOperation(value = "/测试",notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+    public JsonResponse debug(HttpServletRequest request) throws Exception {
+
+        return JsonResponse.newInstance().ok("测aaaaaa11");
+    }
+
+
+}

beneficiation/src/main/java/com/ccsens/beneficiation/api/ParameterController.java

@@ -0,0 +1,53 @@
+package com.ccsens.beneficiation.api;
+
+import com.ccsens.beneficiation.bean.dto.ParameterDto;
+import com.ccsens.beneficiation.bean.dto.WeightDto;
+import com.ccsens.beneficiation.bean.vo.ParameterVo;
+import com.ccsens.beneficiation.bean.vo.WeightVo;
+import com.ccsens.beneficiation.service.IParameterService;
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Api(tags = "查看设置参数" , description = "")
+@RestController
+@RequestMapping("/parameter")
+public class ParameterController {
+    @Resource
+    private IParameterService parameterService;
+
+    @MustLogin
+    @ApiOperation(value = "查看各个设备的参数", notes = "")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ParameterVo.QueryParameter> queryParameter(@ApiParam @Validated @RequestBody QueryDto params) {
+        log.info("查看各个设备的参数：{}",params);
+        ParameterVo.QueryParameter parameterInfo = parameterService.queryParameter(params.getParam());
+        log.info("各个设备的参数:{}",parameterInfo);
+        return JsonResponse.newInstance().ok(parameterInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "修改设备的参数", notes = "")
+    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateParameter(@ApiParam @Validated @RequestBody QueryDto<ParameterDto.ParameterInfo> params) throws Exception {
+        log.info("修改设备的参数：{}",params);
+        parameterService.updateParameter(params.getParam());
+        log.info("修改设备的参数成功");
+        return JsonResponse.newInstance().ok();
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/api/WeightController.java

@@ -0,0 +1,52 @@
+package com.ccsens.beneficiation.api;
+
+import com.ccsens.beneficiation.bean.dto.WeightDto;
+import com.ccsens.beneficiation.bean.vo.WeightVo;
+import com.ccsens.beneficiation.service.IWeightService;
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Api(tags = "皮带秤每天上传的重量统计相关" , description = "")
+@RestController
+@RequestMapping("/weight")
+public class WeightController {
+    @Resource
+    private IWeightService weightService;
+
+    @MustLogin
+    @ApiOperation(value = "重量统计折线图", notes = "")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<WeightVo.WeightDay>> queryWeight(@ApiParam @Validated @RequestBody QueryDto<WeightDto.GetWeightByDay> params) {
+        log.info("统计每天的重量：{}",params);
+        List<WeightVo.WeightDay> weightDay = weightService.queryWeightDay(params.getParam());
+        log.info("统计每天的重量成功");
+        return JsonResponse.newInstance().ok(weightDay);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "重量累计表格", notes = "")
+    @RequestMapping(value = "/total", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<WeightVo.WeightTotal> queryWeightTotal(@ApiParam @Validated @RequestBody QueryDto<WeightDto.GetWeightTotal> params) {
+        log.info("重量累计表格：{}",params);
+        WeightVo.WeightTotal weightTotal = weightService.queryWeightTotal(params.getParam());
+        log.info("重量累计表格返回");
+        return JsonResponse.newInstance().ok(weightTotal);
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/Message/BaseMessageDto.java

@@ -0,0 +1,66 @@
+package com.ccsens.beneficiation.bean.dto.Message;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.ccsens.util.bean.message.common.InMessage;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@Data
+public class BaseMessageDto {
+    @Data
+    public static class MessageUser {
+        private Long id;
+        private Long userId;    //本质上是authId  //20190507 本质上是userId
+        private String nickname;
+        private String avatarUrl;
+        private boolean hasRead;
+        public MessageUser(){
+            hasRead = false;
+        }
+        public MessageUser(Long userId){
+            hasRead = false;
+            this.userId = userId;
+        }
+        public MessageUser(Long id,Long userId,String nickname,String avatarUrl){
+            this();
+            this.id = id;
+            this.userId = userId;
+            this.nickname = nickname;
+            this.avatarUrl = avatarUrl;
+        }
+
+        public static List<MessageUser> userIdToUsers(List<Long> userIds) {
+            List<MessageUser> users = new ArrayList<>();
+            userIds.forEach(userId ->{
+                users.add(new MessageUser(userId));
+            });
+            return users;
+        }
+    }
+
+    private Long time;
+    private String type;
+    private String event;
+    private Long projectId;
+    private MessageUser sender;
+    private List<MessageUser> receivers;
+//    private Object data;
+
+    public Set<String> receiversTransTos() {
+        Set<String> tos = new HashSet<>();
+        if (CollectionUtil.isEmpty(receivers)) {
+            return tos;
+        }
+        receivers.forEach(receiver -> {
+            InMessage.To to = new InMessage.To(receiver.getUserId());
+            tos.add(JSONObject.toJSONString(to));
+        });
+
+        return tos;
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/Message/BeneficiationMessageDto.java

@@ -0,0 +1,35 @@
+package com.ccsens.beneficiation.bean.dto.Message;
+
+import lombok.Data;
+
+/**
+ * @author 逗
+ */
+@Data
+public class BeneficiationMessageDto {
+    /**
+     * 设备编号
+     */
+    private String authId;
+    /**
+     *
+     */
+    private Byte type;
+    /**
+     * 寄存器地址
+     */
+    private int addr;
+    /**
+     * 类型对应的值，
+     */
+    private int value;
+    /**
+     * 版本号
+     */
+    private String version;
+    /**
+     * 时间
+     */
+    private Long time = System.currentTimeMillis();
+
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/Message/PendingMessage.java

@@ -0,0 +1,31 @@
+package com.ccsens.beneficiation.bean.dto.Message;
+
+import lombok.Data;
+
+/**
+ * @author 逗
+ */
+@Data
+public class PendingMessage {
+    /**
+     * 设备编号
+     */
+    private String authId;
+    /**
+     * 寄存器地址
+     */
+    private int addr;
+    /**
+     * 类型对应的值，
+     */
+    private String value;
+    /**
+     * 版本号
+     */
+    private String version;
+    /**
+     * 时间
+     */
+    private Long time = System.currentTimeMillis();
+
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/ParameterDto.java

@@ -0,0 +1,69 @@
+package com.ccsens.beneficiation.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @author 逗
+ */
+@Data
+public class ParameterDto {
+    @Data
+    @ApiModel("修改仪器的参数")
+    public static class ParameterInfo{
+        @ApiModelProperty("电耳1")
+        private ParameterThreshold electricEar1;
+        @ApiModelProperty("电耳2")
+        private ParameterThreshold electricEar2;
+        @ApiModelProperty("电磁阀1")
+        private Parameter solenoidValue1;
+        @ApiModelProperty("电磁阀2")
+        private Parameter solenoidValue2;
+        @ApiModelProperty("变频器1")
+        private Parameter transducer1;
+        @ApiModelProperty("变频器2")
+        private Parameter transducer2;
+        @ApiModelProperty("变频器3")
+        private Parameter transducer3;
+        @ApiModelProperty("变频器4")
+        private Parameter transducer4;
+    }
+
+    @Data
+    @ApiModel("单个仪器的参数")
+    public static class Parameter{
+        @NotNull
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("设置值")
+        private BigDecimal settingValue;
+    }
+
+    @Data
+    @ApiModel("电耳的阀值")
+    public static class ParameterThreshold{
+        @NotNull
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("阀值1")
+        private Threshold thresholdValue1;
+        @ApiModelProperty("阀值2")
+        private Threshold thresholdValue2;
+        @ApiModelProperty("阀值3")
+        private Threshold thresholdValue3;
+
+    }
+    @Data
+    @ApiModel("阀值的最大最小值")
+    public static class Threshold{
+        @ApiModelProperty("最小")
+        private BigDecimal minValue;
+        @ApiModelProperty("最大")
+        private BigDecimal maxValue;
+    }
+
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/WeightDto.java

@@ -0,0 +1,54 @@
+package com.ccsens.beneficiation.bean.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 逗
+ */
+@Data
+public class WeightDto {
+
+    @Data
+    @ApiModel("统计重量信息")
+    public static class GetWeightByDay {
+        @ApiModelProperty("设备id（皮带秤id）默认1")
+        private Long equipmentId = 1L;
+        @ApiModelProperty("开始时间 不传默认查询全部")
+        private Date startTime;
+        @ApiModelProperty("结束时间 不传默认查询全部")
+        private Date endTime;
+        @ApiModelProperty("查询颗粒度 0天 1周 2月 3年 默认天")
+        private int dateType;
+        @JsonIgnore
+        private String dateTypeStr;
+
+        public String getDateTypeStr() {
+            switch (dateType){
+                case 1:
+                    return "%Y-%u";
+                case 2:
+                    return "%Y-%m";
+                case 3:
+                    return "%Y";
+                default:
+                    return "%Y-%m-%d";
+            }
+        }
+    }
+
+
+    @Data
+    @ApiModel("查询重量累计")
+    public static class GetWeightTotal {
+        @ApiModelProperty("日期 为空则默认当前")
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        private Date datetime;
+
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/AdjustRecord.java

@@ -0,0 +1,150 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AdjustRecord implements Serializable {
+    private Long id;
+
+    private Long time;
+
+    private Long monitoringId;
+
+    private String monitoringValue;
+
+    private Long thresholdId;
+
+    private Long equipmentId;
+
+    private String beforeValue;
+
+    private String afterValue;
+
+    private Long operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTime() {
+        return time;
+    }
+
+    public void setTime(Long time) {
+        this.time = time;
+    }
+
+    public Long getMonitoringId() {
+        return monitoringId;
+    }
+
+    public void setMonitoringId(Long monitoringId) {
+        this.monitoringId = monitoringId;
+    }
+
+    public String getMonitoringValue() {
+        return monitoringValue;
+    }
+
+    public void setMonitoringValue(String monitoringValue) {
+        this.monitoringValue = monitoringValue == null ? null : monitoringValue.trim();
+    }
+
+    public Long getThresholdId() {
+        return thresholdId;
+    }
+
+    public void setThresholdId(Long thresholdId) {
+        this.thresholdId = thresholdId;
+    }
+
+    public Long getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Long equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public String getBeforeValue() {
+        return beforeValue;
+    }
+
+    public void setBeforeValue(String beforeValue) {
+        this.beforeValue = beforeValue == null ? null : beforeValue.trim();
+    }
+
+    public String getAfterValue() {
+        return afterValue;
+    }
+
+    public void setAfterValue(String afterValue) {
+        this.afterValue = afterValue == null ? null : afterValue.trim();
+    }
+
+    public Long getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Long operator) {
+        this.operator = operator;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", time=").append(time);
+        sb.append(", monitoringId=").append(monitoringId);
+        sb.append(", monitoringValue=").append(monitoringValue);
+        sb.append(", thresholdId=").append(thresholdId);
+        sb.append(", equipmentId=").append(equipmentId);
+        sb.append(", beforeValue=").append(beforeValue);
+        sb.append(", afterValue=").append(afterValue);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/AdjustRecordExample.java

@@ -0,0 +1,951 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class AdjustRecordExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public AdjustRecordExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNull() {
+            addCriterion("time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNotNull() {
+            addCriterion("time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeEqualTo(Long value) {
+            addCriterion("time =", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotEqualTo(Long value) {
+            addCriterion("time <>", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThan(Long value) {
+            addCriterion("time >", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("time >=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThan(Long value) {
+            addCriterion("time <", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThanOrEqualTo(Long value) {
+            addCriterion("time <=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIn(List<Long> values) {
+            addCriterion("time in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotIn(List<Long> values) {
+            addCriterion("time not in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeBetween(Long value1, Long value2) {
+            addCriterion("time between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotBetween(Long value1, Long value2) {
+            addCriterion("time not between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdIsNull() {
+            addCriterion("monitoring_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdIsNotNull() {
+            addCriterion("monitoring_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdEqualTo(Long value) {
+            addCriterion("monitoring_id =", value, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdNotEqualTo(Long value) {
+            addCriterion("monitoring_id <>", value, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdGreaterThan(Long value) {
+            addCriterion("monitoring_id >", value, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("monitoring_id >=", value, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdLessThan(Long value) {
+            addCriterion("monitoring_id <", value, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdLessThanOrEqualTo(Long value) {
+            addCriterion("monitoring_id <=", value, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdIn(List<Long> values) {
+            addCriterion("monitoring_id in", values, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdNotIn(List<Long> values) {
+            addCriterion("monitoring_id not in", values, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdBetween(Long value1, Long value2) {
+            addCriterion("monitoring_id between", value1, value2, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringIdNotBetween(Long value1, Long value2) {
+            addCriterion("monitoring_id not between", value1, value2, "monitoringId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueIsNull() {
+            addCriterion("monitoring_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueIsNotNull() {
+            addCriterion("monitoring_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueEqualTo(String value) {
+            addCriterion("monitoring_value =", value, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueNotEqualTo(String value) {
+            addCriterion("monitoring_value <>", value, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueGreaterThan(String value) {
+            addCriterion("monitoring_value >", value, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueGreaterThanOrEqualTo(String value) {
+            addCriterion("monitoring_value >=", value, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueLessThan(String value) {
+            addCriterion("monitoring_value <", value, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueLessThanOrEqualTo(String value) {
+            addCriterion("monitoring_value <=", value, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueLike(String value) {
+            addCriterion("monitoring_value like", value, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueNotLike(String value) {
+            addCriterion("monitoring_value not like", value, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueIn(List<String> values) {
+            addCriterion("monitoring_value in", values, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueNotIn(List<String> values) {
+            addCriterion("monitoring_value not in", values, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueBetween(String value1, String value2) {
+            addCriterion("monitoring_value between", value1, value2, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andMonitoringValueNotBetween(String value1, String value2) {
+            addCriterion("monitoring_value not between", value1, value2, "monitoringValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdIsNull() {
+            addCriterion("threshold_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdIsNotNull() {
+            addCriterion("threshold_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdEqualTo(Long value) {
+            addCriterion("threshold_id =", value, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdNotEqualTo(Long value) {
+            addCriterion("threshold_id <>", value, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdGreaterThan(Long value) {
+            addCriterion("threshold_id >", value, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("threshold_id >=", value, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdLessThan(Long value) {
+            addCriterion("threshold_id <", value, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdLessThanOrEqualTo(Long value) {
+            addCriterion("threshold_id <=", value, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdIn(List<Long> values) {
+            addCriterion("threshold_id in", values, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdNotIn(List<Long> values) {
+            addCriterion("threshold_id not in", values, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdBetween(Long value1, Long value2) {
+            addCriterion("threshold_id between", value1, value2, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThresholdIdNotBetween(Long value1, Long value2) {
+            addCriterion("threshold_id not between", value1, value2, "thresholdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNull() {
+            addCriterion("equipment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNotNull() {
+            addCriterion("equipment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdEqualTo(Long value) {
+            addCriterion("equipment_id =", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotEqualTo(Long value) {
+            addCriterion("equipment_id <>", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThan(Long value) {
+            addCriterion("equipment_id >", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("equipment_id >=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThan(Long value) {
+            addCriterion("equipment_id <", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThanOrEqualTo(Long value) {
+            addCriterion("equipment_id <=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIn(List<Long> values) {
+            addCriterion("equipment_id in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotIn(List<Long> values) {
+            addCriterion("equipment_id not in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdBetween(Long value1, Long value2) {
+            addCriterion("equipment_id between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotBetween(Long value1, Long value2) {
+            addCriterion("equipment_id not between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueIsNull() {
+            addCriterion("before_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueIsNotNull() {
+            addCriterion("before_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueEqualTo(String value) {
+            addCriterion("before_value =", value, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueNotEqualTo(String value) {
+            addCriterion("before_value <>", value, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueGreaterThan(String value) {
+            addCriterion("before_value >", value, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueGreaterThanOrEqualTo(String value) {
+            addCriterion("before_value >=", value, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueLessThan(String value) {
+            addCriterion("before_value <", value, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueLessThanOrEqualTo(String value) {
+            addCriterion("before_value <=", value, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueLike(String value) {
+            addCriterion("before_value like", value, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueNotLike(String value) {
+            addCriterion("before_value not like", value, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueIn(List<String> values) {
+            addCriterion("before_value in", values, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueNotIn(List<String> values) {
+            addCriterion("before_value not in", values, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueBetween(String value1, String value2) {
+            addCriterion("before_value between", value1, value2, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andBeforeValueNotBetween(String value1, String value2) {
+            addCriterion("before_value not between", value1, value2, "beforeValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueIsNull() {
+            addCriterion("after_value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueIsNotNull() {
+            addCriterion("after_value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueEqualTo(String value) {
+            addCriterion("after_value =", value, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueNotEqualTo(String value) {
+            addCriterion("after_value <>", value, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueGreaterThan(String value) {
+            addCriterion("after_value >", value, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueGreaterThanOrEqualTo(String value) {
+            addCriterion("after_value >=", value, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueLessThan(String value) {
+            addCriterion("after_value <", value, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueLessThanOrEqualTo(String value) {
+            addCriterion("after_value <=", value, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueLike(String value) {
+            addCriterion("after_value like", value, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueNotLike(String value) {
+            addCriterion("after_value not like", value, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueIn(List<String> values) {
+            addCriterion("after_value in", values, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueNotIn(List<String> values) {
+            addCriterion("after_value not in", values, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueBetween(String value1, String value2) {
+            addCriterion("after_value between", value1, value2, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andAfterValueNotBetween(String value1, String value2) {
+            addCriterion("after_value not between", value1, value2, "afterValue");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Equipment.java

@@ -0,0 +1,106 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Equipment implements Serializable {
+    private Long id;
+
+    private Byte type;
+
+    private String authId;
+
+    private String verion;
+
+    private Long operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public String getAuthId() {
+        return authId;
+    }
+
+    public void setAuthId(String authId) {
+        this.authId = authId == null ? null : authId.trim();
+    }
+
+    public String getVerion() {
+        return verion;
+    }
+
+    public void setVerion(String verion) {
+        this.verion = verion == null ? null : verion.trim();
+    }
+
+    public Long getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Long operator) {
+        this.operator = operator;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", type=").append(type);
+        sb.append(", authId=").append(authId);
+        sb.append(", verion=").append(verion);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/EquipmentExample.java

@@ -0,0 +1,701 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class EquipmentExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EquipmentExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdIsNull() {
+            addCriterion("auth_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdIsNotNull() {
+            addCriterion("auth_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdEqualTo(String value) {
+            addCriterion("auth_id =", value, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdNotEqualTo(String value) {
+            addCriterion("auth_id <>", value, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdGreaterThan(String value) {
+            addCriterion("auth_id >", value, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdGreaterThanOrEqualTo(String value) {
+            addCriterion("auth_id >=", value, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdLessThan(String value) {
+            addCriterion("auth_id <", value, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdLessThanOrEqualTo(String value) {
+            addCriterion("auth_id <=", value, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdLike(String value) {
+            addCriterion("auth_id like", value, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdNotLike(String value) {
+            addCriterion("auth_id not like", value, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdIn(List<String> values) {
+            addCriterion("auth_id in", values, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdNotIn(List<String> values) {
+            addCriterion("auth_id not in", values, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdBetween(String value1, String value2) {
+            addCriterion("auth_id between", value1, value2, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthIdNotBetween(String value1, String value2) {
+            addCriterion("auth_id not between", value1, value2, "authId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionIsNull() {
+            addCriterion("verion is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionIsNotNull() {
+            addCriterion("verion is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionEqualTo(String value) {
+            addCriterion("verion =", value, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionNotEqualTo(String value) {
+            addCriterion("verion <>", value, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionGreaterThan(String value) {
+            addCriterion("verion >", value, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionGreaterThanOrEqualTo(String value) {
+            addCriterion("verion >=", value, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionLessThan(String value) {
+            addCriterion("verion <", value, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionLessThanOrEqualTo(String value) {
+            addCriterion("verion <=", value, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionLike(String value) {
+            addCriterion("verion like", value, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionNotLike(String value) {
+            addCriterion("verion not like", value, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionIn(List<String> values) {
+            addCriterion("verion in", values, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionNotIn(List<String> values) {
+            addCriterion("verion not in", values, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionBetween(String value1, String value2) {
+            addCriterion("verion between", value1, value2, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andVerionNotBetween(String value1, String value2) {
+            addCriterion("verion not between", value1, value2, "verion");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/EquipmentType.java

@@ -0,0 +1,106 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class EquipmentType implements Serializable {
+    private Long id;
+
+    private Long equipmentId;
+
+    private Byte type;
+
+    private Integer addr;
+
+    private Long operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Long equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    public Integer getAddr() {
+        return addr;
+    }
+
+    public void setAddr(Integer addr) {
+        this.addr = addr;
+    }
+
+    public Long getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Long operator) {
+        this.operator = operator;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", equipmentId=").append(equipmentId);
+        sb.append(", type=").append(type);
+        sb.append(", addr=").append(addr);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/EquipmentTypeExample.java

@@ -0,0 +1,681 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class EquipmentTypeExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EquipmentTypeExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNull() {
+            addCriterion("equipment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNotNull() {
+            addCriterion("equipment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdEqualTo(Long value) {
+            addCriterion("equipment_id =", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotEqualTo(Long value) {
+            addCriterion("equipment_id <>", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThan(Long value) {
+            addCriterion("equipment_id >", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("equipment_id >=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThan(Long value) {
+            addCriterion("equipment_id <", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThanOrEqualTo(Long value) {
+            addCriterion("equipment_id <=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIn(List<Long> values) {
+            addCriterion("equipment_id in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotIn(List<Long> values) {
+            addCriterion("equipment_id not in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdBetween(Long value1, Long value2) {
+            addCriterion("equipment_id between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotBetween(Long value1, Long value2) {
+            addCriterion("equipment_id not between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrIsNull() {
+            addCriterion("addr is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrIsNotNull() {
+            addCriterion("addr is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrEqualTo(Integer value) {
+            addCriterion("addr =", value, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrNotEqualTo(Integer value) {
+            addCriterion("addr <>", value, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrGreaterThan(Integer value) {
+            addCriterion("addr >", value, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrGreaterThanOrEqualTo(Integer value) {
+            addCriterion("addr >=", value, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrLessThan(Integer value) {
+            addCriterion("addr <", value, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrLessThanOrEqualTo(Integer value) {
+            addCriterion("addr <=", value, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrIn(List<Integer> values) {
+            addCriterion("addr in", values, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrNotIn(List<Integer> values) {
+            addCriterion("addr not in", values, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrBetween(Integer value1, Integer value2) {
+            addCriterion("addr between", value1, value2, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddrNotBetween(Integer value1, Integer value2) {
+            addCriterion("addr not between", value1, value2, "addr");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Record.java

@@ -0,0 +1,117 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Record implements Serializable {
+    private Long id;
+
+    private Long equipmentId;
+
+    private Integer value;
+
+    private Date time;
+
+    private Long operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private Byte type;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Long equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public Long getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Long operator) {
+        this.operator = operator;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    public Byte getType() {
+        return type;
+    }
+
+    public void setType(Byte type) {
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", equipmentId=").append(equipmentId);
+        sb.append(", value=").append(value);
+        sb.append(", time=").append(time);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append(", type=").append(type);
+        sb.append("]");
+        return sb.toString();
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/RecordExample.java

@@ -0,0 +1,741 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class RecordExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public RecordExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNull() {
+            addCriterion("equipment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNotNull() {
+            addCriterion("equipment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdEqualTo(Long value) {
+            addCriterion("equipment_id =", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotEqualTo(Long value) {
+            addCriterion("equipment_id <>", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThan(Long value) {
+            addCriterion("equipment_id >", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("equipment_id >=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThan(Long value) {
+            addCriterion("equipment_id <", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThanOrEqualTo(Long value) {
+            addCriterion("equipment_id <=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIn(List<Long> values) {
+            addCriterion("equipment_id in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotIn(List<Long> values) {
+            addCriterion("equipment_id not in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdBetween(Long value1, Long value2) {
+            addCriterion("equipment_id between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotBetween(Long value1, Long value2) {
+            addCriterion("equipment_id not between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNull() {
+            addCriterion("value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNotNull() {
+            addCriterion("value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueEqualTo(Integer value) {
+            addCriterion("value =", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotEqualTo(Integer value) {
+            addCriterion("value <>", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThan(Integer value) {
+            addCriterion("value >", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThanOrEqualTo(Integer value) {
+            addCriterion("value >=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThan(Integer value) {
+            addCriterion("value <", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThanOrEqualTo(Integer value) {
+            addCriterion("value <=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<Integer> values) {
+            addCriterion("value in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotIn(List<Integer> values) {
+            addCriterion("value not in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueBetween(Integer value1, Integer value2) {
+            addCriterion("value between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotBetween(Integer value1, Integer value2) {
+            addCriterion("value not between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNull() {
+            addCriterion("time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNotNull() {
+            addCriterion("time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeEqualTo(Date value) {
+            addCriterion("time =", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotEqualTo(Date value) {
+            addCriterion("time <>", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThan(Date value) {
+            addCriterion("time >", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("time >=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThan(Date value) {
+            addCriterion("time <", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThanOrEqualTo(Date value) {
+            addCriterion("time <=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIn(List<Date> values) {
+            addCriterion("time in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotIn(List<Date> values) {
+            addCriterion("time not in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeBetween(Date value1, Date value2) {
+            addCriterion("time between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotBetween(Date value1, Date value2) {
+            addCriterion("time not between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Byte value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Byte value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Byte value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Byte value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Byte value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Byte value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Byte> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Byte> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Byte value1, Byte value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Byte value1, Byte value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/ThresholdValue.java

@@ -0,0 +1,117 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ThresholdValue implements Serializable {
+    private Long id;
+
+    private Long equipmentId;
+
+    private Byte stages;
+
+    private Integer max;
+
+    private Integer min;
+
+    private Long operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Long equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public Byte getStages() {
+        return stages;
+    }
+
+    public void setStages(Byte stages) {
+        this.stages = stages;
+    }
+
+    public Integer getMax() {
+        return max;
+    }
+
+    public void setMax(Integer max) {
+        this.max = max;
+    }
+
+    public Integer getMin() {
+        return min;
+    }
+
+    public void setMin(Integer min) {
+        this.min = min;
+    }
+
+    public Long getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Long operator) {
+        this.operator = operator;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", equipmentId=").append(equipmentId);
+        sb.append(", stages=").append(stages);
+        sb.append(", max=").append(max);
+        sb.append(", min=").append(min);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/ThresholdValueExample.java

@@ -0,0 +1,741 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ThresholdValueExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public ThresholdValueExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNull() {
+            addCriterion("equipment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNotNull() {
+            addCriterion("equipment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdEqualTo(Long value) {
+            addCriterion("equipment_id =", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotEqualTo(Long value) {
+            addCriterion("equipment_id <>", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThan(Long value) {
+            addCriterion("equipment_id >", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("equipment_id >=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThan(Long value) {
+            addCriterion("equipment_id <", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThanOrEqualTo(Long value) {
+            addCriterion("equipment_id <=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIn(List<Long> values) {
+            addCriterion("equipment_id in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotIn(List<Long> values) {
+            addCriterion("equipment_id not in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdBetween(Long value1, Long value2) {
+            addCriterion("equipment_id between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotBetween(Long value1, Long value2) {
+            addCriterion("equipment_id not between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesIsNull() {
+            addCriterion("stages is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesIsNotNull() {
+            addCriterion("stages is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesEqualTo(Byte value) {
+            addCriterion("stages =", value, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesNotEqualTo(Byte value) {
+            addCriterion("stages <>", value, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesGreaterThan(Byte value) {
+            addCriterion("stages >", value, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesGreaterThanOrEqualTo(Byte value) {
+            addCriterion("stages >=", value, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesLessThan(Byte value) {
+            addCriterion("stages <", value, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesLessThanOrEqualTo(Byte value) {
+            addCriterion("stages <=", value, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesIn(List<Byte> values) {
+            addCriterion("stages in", values, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesNotIn(List<Byte> values) {
+            addCriterion("stages not in", values, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesBetween(Byte value1, Byte value2) {
+            addCriterion("stages between", value1, value2, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andStagesNotBetween(Byte value1, Byte value2) {
+            addCriterion("stages not between", value1, value2, "stages");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxIsNull() {
+            addCriterion("max is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxIsNotNull() {
+            addCriterion("max is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxEqualTo(Integer value) {
+            addCriterion("max =", value, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxNotEqualTo(Integer value) {
+            addCriterion("max <>", value, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxGreaterThan(Integer value) {
+            addCriterion("max >", value, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxGreaterThanOrEqualTo(Integer value) {
+            addCriterion("max >=", value, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxLessThan(Integer value) {
+            addCriterion("max <", value, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxLessThanOrEqualTo(Integer value) {
+            addCriterion("max <=", value, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxIn(List<Integer> values) {
+            addCriterion("max in", values, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxNotIn(List<Integer> values) {
+            addCriterion("max not in", values, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxBetween(Integer value1, Integer value2) {
+            addCriterion("max between", value1, value2, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMaxNotBetween(Integer value1, Integer value2) {
+            addCriterion("max not between", value1, value2, "max");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinIsNull() {
+            addCriterion("min is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinIsNotNull() {
+            addCriterion("min is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinEqualTo(Integer value) {
+            addCriterion("min =", value, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinNotEqualTo(Integer value) {
+            addCriterion("min <>", value, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinGreaterThan(Integer value) {
+            addCriterion("min >", value, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinGreaterThanOrEqualTo(Integer value) {
+            addCriterion("min >=", value, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinLessThan(Integer value) {
+            addCriterion("min <", value, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinLessThanOrEqualTo(Integer value) {
+            addCriterion("min <=", value, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinIn(List<Integer> values) {
+            addCriterion("min in", values, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinNotIn(List<Integer> values) {
+            addCriterion("min not in", values, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinBetween(Integer value1, Integer value2) {
+            addCriterion("min between", value1, value2, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andMinNotBetween(Integer value1, Integer value2) {
+            addCriterion("min not between", value1, value2, "min");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Weight.java

@@ -0,0 +1,106 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Weight implements Serializable {
+    private Long id;
+
+    private Long equipmentId;
+
+    private String weight;
+
+    private Date time;
+
+    private Long operator;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getEquipmentId() {
+        return equipmentId;
+    }
+
+    public void setEquipmentId(Long equipmentId) {
+        this.equipmentId = equipmentId;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight == null ? null : weight.trim();
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public Long getOperator() {
+        return operator;
+    }
+
+    public void setOperator(Long operator) {
+        this.operator = operator;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", equipmentId=").append(equipmentId);
+        sb.append(", weight=").append(weight);
+        sb.append(", time=").append(time);
+        sb.append(", operator=").append(operator);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/WeightExample.java

@@ -0,0 +1,691 @@
+package com.ccsens.beneficiation.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class WeightExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public WeightExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNull() {
+            addCriterion("equipment_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIsNotNull() {
+            addCriterion("equipment_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdEqualTo(Long value) {
+            addCriterion("equipment_id =", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotEqualTo(Long value) {
+            addCriterion("equipment_id <>", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThan(Long value) {
+            addCriterion("equipment_id >", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("equipment_id >=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThan(Long value) {
+            addCriterion("equipment_id <", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdLessThanOrEqualTo(Long value) {
+            addCriterion("equipment_id <=", value, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdIn(List<Long> values) {
+            addCriterion("equipment_id in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotIn(List<Long> values) {
+            addCriterion("equipment_id not in", values, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdBetween(Long value1, Long value2) {
+            addCriterion("equipment_id between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andEquipmentIdNotBetween(Long value1, Long value2) {
+            addCriterion("equipment_id not between", value1, value2, "equipmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNull() {
+            addCriterion("weight is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIsNotNull() {
+            addCriterion("weight is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightEqualTo(String value) {
+            addCriterion("weight =", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotEqualTo(String value) {
+            addCriterion("weight <>", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThan(String value) {
+            addCriterion("weight >", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightGreaterThanOrEqualTo(String value) {
+            addCriterion("weight >=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThan(String value) {
+            addCriterion("weight <", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLessThanOrEqualTo(String value) {
+            addCriterion("weight <=", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightLike(String value) {
+            addCriterion("weight like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotLike(String value) {
+            addCriterion("weight not like", value, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightIn(List<String> values) {
+            addCriterion("weight in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotIn(List<String> values) {
+            addCriterion("weight not in", values, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightBetween(String value1, String value2) {
+            addCriterion("weight between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andWeightNotBetween(String value1, String value2) {
+            addCriterion("weight not between", value1, value2, "weight");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNull() {
+            addCriterion("time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIsNotNull() {
+            addCriterion("time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeEqualTo(Date value) {
+            addCriterion("time =", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotEqualTo(Date value) {
+            addCriterion("time <>", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThan(Date value) {
+            addCriterion("time >", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("time >=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThan(Date value) {
+            addCriterion("time <", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeLessThanOrEqualTo(Date value) {
+            addCriterion("time <=", value, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeIn(List<Date> values) {
+            addCriterion("time in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotIn(List<Date> values) {
+            addCriterion("time not in", values, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeBetween(Date value1, Date value2) {
+            addCriterion("time between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andTimeNotBetween(Date value1, Date value2) {
+            addCriterion("time not between", value1, value2, "time");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNull() {
+            addCriterion("operator is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIsNotNull() {
+            addCriterion("operator is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorEqualTo(Long value) {
+            addCriterion("operator =", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotEqualTo(Long value) {
+            addCriterion("operator <>", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThan(Long value) {
+            addCriterion("operator >", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorGreaterThanOrEqualTo(Long value) {
+            addCriterion("operator >=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThan(Long value) {
+            addCriterion("operator <", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorLessThanOrEqualTo(Long value) {
+            addCriterion("operator <=", value, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorIn(List<Long> values) {
+            addCriterion("operator in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotIn(List<Long> values) {
+            addCriterion("operator not in", values, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorBetween(Long value1, Long value2) {
+            addCriterion("operator between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorNotBetween(Long value1, Long value2) {
+            addCriterion("operator not between", value1, value2, "operator");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Date value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Date value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Date value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Date value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Date value1, Date value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Date value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Date value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Date value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Date value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Date value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Date value1, Date value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Date value1, Date value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNull() {
+            addCriterion("rec_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIsNotNull() {
+            addCriterion("rec_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusEqualTo(Byte value) {
+            addCriterion("rec_status =", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotEqualTo(Byte value) {
+            addCriterion("rec_status <>", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThan(Byte value) {
+            addCriterion("rec_status >", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) {
+            addCriterion("rec_status >=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThan(Byte value) {
+            addCriterion("rec_status <", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusLessThanOrEqualTo(Byte value) {
+            addCriterion("rec_status <=", value, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusIn(List<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> values) {
+            addCriterion("rec_status not in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotBetween(Byte value1, Byte value2) {
+            addCriterion("rec_status not between", value1, value2, "recStatus");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/MessageVo.java

@@ -0,0 +1,39 @@
+package com.ccsens.beneficiation.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Data
+public class MessageVo {
+
+    @Data
+    public static class AddrDispose{
+        private Long id;
+        private Integer startAddr;
+        private Integer endAddr;
+        private Integer contentNum;
+        private String contentLength;
+    }
+
+    @Data
+    public static class AchieveMessage{
+        private Integer addr;
+        private Integer value;
+    }
+
+    @Data
+    public static class EquipmentType{
+        //设备id
+        private Long id;
+        //设备类型
+        private Byte equipmentType;
+        //消息类型
+        private Byte messageType;
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java

@@ -0,0 +1,166 @@
+package com.ccsens.beneficiation.bean.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Data
+public class ParameterVo {
+
+    @Data
+    @ApiModel("查看每个仪器的参数")
+    public static class QueryParameter{
+        @ApiModelProperty("只有实时值 能修改，例：变频器")
+        private List<Transducer> transducers;
+        @ApiModelProperty("实时值累计值，不能修改，例：皮带秤")
+        private List<BeltWeigher> beltWeigher;
+        @ApiModelProperty("有阀值能设置 例：电耳")
+        private List<Parameter> parameter;
+    }
+
+    @Data
+    @ApiModel("只有实时值 能修改，例：变频器")
+    public static class Transducer{
+        @ApiModelProperty("设备名")
+        private String title;
+        @ApiModelProperty("参数")
+        private List<TransducerValue> values;
+    }
+
+    @Data
+    @ApiModel("只有实时值 能修改，例：变频器")
+    public static class TransducerValue{
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("修改时用的类型")
+        private String type;
+        @ApiModelProperty("名字")
+        private String key;
+        @ApiModelProperty("实时值")
+        private BigDecimal currentTimeValue;
+        @ApiModelProperty("设定值")
+        private BigDecimal setTimeValue;
+
+
+        public TransducerValue(Long id, String type, String key, BigDecimal currentTimeValue) {
+            this.id = id;
+            this.type = type;
+            this.key = key;
+            this.currentTimeValue = currentTimeValue;
+        }
+
+        public TransducerValue() {
+        }
+    }
+    @Data
+    @ApiModel("实时值累计值，不能修改，例：皮带秤")
+    public static class BeltWeigher{
+        @ApiModelProperty("设备名")
+        private String title;
+        @ApiModelProperty("参数")
+        private List<BeltWeigherValue> values;
+    }
+
+    @Data
+    @ApiModel("实时值累计值，不能修改，例：皮带秤")
+    public static class BeltWeigherValue{
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("名字")
+        private String key;
+        @ApiModelProperty("修改时用的类型")
+        private String type;
+        @ApiModelProperty("实时值")
+        private BigDecimal currentTimeValue;
+        @ApiModelProperty("累计值")
+        private BigDecimal totalValue;
+
+        public BeltWeigherValue(Long id, String key, BigDecimal currentTimeValue, BigDecimal totalValue) {
+            this.id = id;
+            this.key = key;
+            this.currentTimeValue = currentTimeValue;
+            this.totalValue = totalValue;
+        }
+
+        public BeltWeigherValue() {
+        }
+    }
+
+
+    @Data
+    @ApiModel("实时值累计值，不能修改，例：皮带秤")
+    public static class Parameter{
+        @ApiModelProperty("设备名")
+        private String title;
+        @ApiModelProperty("参数")
+        private List<ParameterThreshold> values;
+    }
+    @Data
+    @ApiModel("单个仪器的参数带阀值")
+    public static class ParameterThreshold{
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("修改时用的类型")
+        private String type;
+        @ApiModelProperty("key")
+        private String key;
+        @ApiModelProperty("实时值")
+        private BigDecimal currentTimeValue;
+        @ApiModelProperty("阀值1")
+        private ThresholdValue thresholdValue1;
+        @ApiModelProperty("阀值2")
+        private ThresholdValue thresholdValue2;
+        @ApiModelProperty("阀值3")
+        private ThresholdValue thresholdValue3;
+
+        public ParameterThreshold(Long id, String type, String key, BigDecimal currentTimeValue, ThresholdValue thresholdValue1, ThresholdValue thresholdValue2, ThresholdValue thresholdValue3) {
+            this.id = id;
+            this.type = type;
+            this.key = key;
+            this.currentTimeValue = currentTimeValue;
+            this.thresholdValue1 = thresholdValue1;
+            this.thresholdValue2 = thresholdValue2;
+            this.thresholdValue3 = thresholdValue3;
+        }
+
+        public ParameterThreshold() {
+        }
+    }
+    @Data
+    @ApiModel("阀值")
+    public static class ThresholdValue{
+        @ApiModelProperty("id")
+        private Long id;
+        @ApiModelProperty("修改时用的类型")
+        private String type;
+        @ApiModelProperty("key")
+        private String key;
+        @ApiModelProperty("最小")
+        private BigDecimal minValue;
+        @ApiModelProperty("最大")
+        private BigDecimal maxValue;
+
+        public ThresholdValue(Long id, String type, String key, BigDecimal minValue, BigDecimal maxValue) {
+            this.id = id;
+            this.type = type;
+            this.key = key;
+            this.minValue = minValue;
+            this.maxValue = maxValue;
+        }
+
+        public ThresholdValue(String type, String key) {
+            this.type = type;
+            this.key = key;
+        }
+
+        public ThresholdValue() {
+        }
+    }
+
+}

beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/WeightVo.java

@@ -0,0 +1,37 @@
+package com.ccsens.beneficiation.bean.vo;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author 逗
+ */
+@Data
+public class WeightVo {
+
+    @Data
+    @ApiModel("查看的称重数据折线图")
+    public static class WeightDay {
+        @ApiModelProperty("日期")
+        private String date;
+        @ApiModelProperty("重量")
+        private double weight;
+    }
+
+    @Data
+    @ApiModel("重量累计")
+    public static class WeightTotal {
+        @ApiModelProperty("当天累计")
+        private double weightDay;
+        @ApiModelProperty("本周累计")
+        private double weightWeek;
+        @ApiModelProperty("本月累计")
+        private double weightMonth;
+        @ApiModelProperty("本年累计")
+        private double weightYear;
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/config/BeanConfig.java

@@ -0,0 +1,31 @@
+package com.ccsens.beneficiation.config;
+
+import com.ccsens.beneficiation.intercept.MybatisInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @description:
+ * @author: wuHuiJuan
+ * @create: 2019/12/03 18:01
+ */
+@Configuration
+public class BeanConfig {
+//    @Bean
+//    public static PropertySourcesPlaceholderConfigurer properties(){
+//        PropertySourcesPlaceholderConfigurer conf = new PropertySourcesPlaceholderConfigurer();
+//        YamlPropertiesFactoryBean yml = new YamlPropertiesFactoryBean();
+//        yml.setResources(new ClassPathResource("business.yml"));
+//        conf.setProperties(yml.getObject());
+//        return conf;
+//    }
+
+    /**
+     * 注册拦截器
+     */
+    @Bean
+    public MybatisInterceptor mybatisInterceptor() {
+        MybatisInterceptor interceptor = new MybatisInterceptor();
+        return interceptor;
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/config/SpringConfig.java

@@ -0,0 +1,169 @@
+package com.ccsens.beneficiation.config;
+
+
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
+import com.ccsens.util.config.DruidProps;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.servlet.config.annotation.*;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+@Configuration
+//public class SpringConfig extends WebMvcConfigurationSupport {
+public class SpringConfig implements WebMvcConfigurer {
+    @Resource
+    private DruidProps druidPropsUtil;
+    @Value("${spring.snowflake.workerId}")
+    private String workerId;
+    @Value("${spring.snowflake.datacenterId}")
+    private String datacenterId;
+
+    /**
+     * 配置Converter
+     * @return
+     */
+    @Bean
+    public HttpMessageConverter<String> responseStringConverter() {
+        StringHttpMessageConverter converter = new StringHttpMessageConverter(
+                Charset.forName("UTF-8"));
+        return converter;
+    }
+
+    @Bean
+    public HttpMessageConverter<Object> responseJsonConverter(){
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        List<MediaType> mediaTypeList = new ArrayList<>();
+        mediaTypeList.add(MediaType.TEXT_HTML);
+        mediaTypeList.add(MediaType.APPLICATION_JSON_UTF8);
+        converter.setSupportedMediaTypes(mediaTypeList);
+
+        //converter.setObjectMapper();
+        ObjectMapper objectMapper = new ObjectMapper();
+        SimpleModule simpleModule = new SimpleModule();
+        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
+        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
+        objectMapper.registerModule(simpleModule);
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        converter.setObjectMapper(objectMapper);
+
+        return converter;
+    }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        //super.configureMessageConverters(converters);
+        converters.add(responseStringConverter());
+        converters.add(responseJsonConverter());
+    }
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.favorPathExtension(false);
+    }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**").allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+//                .allowedMethods("*") // 允许提交请求的方法，*表示全部允许
+                        .allowedOrigins("*") // #允许向该服务器提交请求的URI，*表示全部允许
+                        .allowCredentials(true) // 允许cookies跨域
+                        .allowedHeaders("*") // #允许访问的头信息,*表示全部
+                        .maxAge(18000L); // 预检请求的缓存时间（秒），即在这个时间段里，对于相同的跨域请求不会再预检了
+
+    }
+
+    /**
+     * 配置视图解析器  SpringBoot建议使用Thymeleaf代替jsp，动态页面默认路径：resources/template，静态页面默认路径: resources/static
+     * @return
+     */
+//    @Bean
+//    public ViewResolver getViewResolver() {
+//        InternalResourceViewResolver resolver = new InternalResourceViewResolver();
+//        resolver.setPrefix("/WEB-INF/views/");
+//        resolver.setSuffix(".jsp");
+//        return resolver;
+//    }
+//    @Override
+//    public void configureDefaultServletHandling(
+//            DefaultServletHandlerConfigurer configurer) {
+//        configurer.enable();
+//    }
+
+
+    /**
+     * 配置静态资源
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("swagger-ui.html")
+                .addResourceLocations("classpath:/META-INF/resources/");
+        registry.addResourceHandler("/webjars/**")
+                .addResourceLocations("classpath:/META-INF/resources/webjars/");
+
+        registry.addResourceHandler("/uploads/**")
+                .addResourceLocations("file:///home/cloud/beneficiation/uploads/");
+        //super.addResourceHandlers(registry);
+    }
+
+    /**
+     * 配置拦截器
+     * @param registry
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        //addPathPatterns 用于添加拦截规则
+        //excludePathPatterns 用于排除拦截
+//        registry.addInterceptor(tokenInterceptor())
+//                .addPathPatterns("/projects/**")
+//                .addPathPatterns("/messages/**")
+//                .addPathPatterns("/users/**")
+//                    .excludePathPatterns("/users/signin")
+//                    .excludePathPatterns("/users/smscode")
+//                    .excludePathPatterns("/users/signup")
+//                    .excludePathPatterns("/users/password")
+//                    .excludePathPatterns("/users/account")
+//                    .excludePathPatterns("/users/token")
+//                    .excludePathPatterns("/users/claims")
+//                .addPathPatterns("/plugins/**")
+//                .addPathPatterns("/delivers/**")
+//                .addPathPatterns("/tasks/**")
+//                .addPathPatterns("/members/**")
+//                .addPathPatterns("/templates/**")
+//                .addPathPatterns("/hardware/**");
+        //super.addInterceptors(registry);
+    }
+//
+//    @Bean
+//    public TokenInterceptor tokenInterceptor(){
+//        return new TokenInterceptor();
+//    }
+
+    /**
+     * 配置数据源（单数据源）
+     */
+    @Bean
+    public DataSource dataSource(){
+        return druidPropsUtil.createDruidDataSource();
+    }
+
+    @Bean
+    public Snowflake snowflake(){
+//        return new Snowflake(Long.valueOf(workerId),Long.valueOf(datacenterId));
+        return IdUtil.createSnowflake(Long.valueOf(workerId),Long.valueOf(datacenterId));
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/config/SwaggerConfigure.java

@@ -0,0 +1,56 @@
+package com.ccsens.beneficiation.config;
+
+import com.ccsens.util.WebConstant;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ParameterBuilder;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.schema.ModelRef;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Parameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Configuration
+@EnableSwagger2
+@ConditionalOnExpression("${swagger.enable}")
+//public class SwaggerConfigure extends WebMvcConfigurationSupport {
+public class SwaggerConfigure /*implements WebMvcConfigurer*/ {
+    @Bean
+    public Docket customDocket() {
+        //
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors
+                        .basePackage("com.ccsens.beneficiation.api"))
+                .build()
+                .globalOperationParameters(setHeaderToken());
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfo("Swagger Tall-game",//大标题 title
+                "This is a sample server Petstore server.  You can find out more about     Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).      For this sample, you can use the api key `special-key` to test the authorization     filters.",//小标题
+                "1.0.0",//版本
+                "http://swagger.io/terms/",//termsOfServiceUrl
+                "zhangsan",//作者
+                "Apache 2.0",//链接显示文字
+                "http://www.apache.org/licenses/LICENSE-2.0.html"//网站链接
+        );
+    }
+
+    private List<Parameter> setHeaderToken() {
+        ParameterBuilder tokenPar = new ParameterBuilder();
+        List<Parameter> pars = new ArrayList<>();
+        tokenPar.name(WebConstant.HEADER_KEY_TOKEN).description("token")
+                .defaultValue(WebConstant.HEADER_KEY_TOKEN_PREFIX)
+                .modelRef(new ModelRef("string")).parameterType("header").required(false).build();
+        pars.add(tokenPar.build());
+        return pars;
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/intercept/MybatisInterceptor.java

@@ -0,0 +1,159 @@
+package com.ccsens.beneficiation.intercept;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.ccsens.util.WebConstant;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ResultMap;
+import org.apache.ibatis.mapping.SqlSource;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.DefaultReflectorFactory;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
+import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @description:
+ * @author: wuHuiJuan
+ * @create: 2019/12/11 10:58
+ */
+@Intercepts({
+        @Signature(
+            type = Executor.class,
+            method = "query",
+            args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class}
+        )
+})
+public class MybatisInterceptor implements Interceptor {
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+
+
+        String selectByExample = "selectByExample";
+        String countByExample = "countByExample";
+        String countByExample2 = "selectByExample_COUNT";
+        String selectByPrimaryKey = "selectByPrimaryKey";
+
+            Object[] args = invocation.getArgs();
+        MappedStatement statement = (MappedStatement) args[0];
+        if (statement.getId().endsWith(selectByExample)
+                || statement.getId().endsWith(countByExample)
+                || statement.getId().endsWith(countByExample2)) {
+            //XXXExample
+            Object example = args[1];
+
+            addCondition(statement, example);
+
+
+
+
+        } else if (statement.getId().endsWith(selectByPrimaryKey)) {
+            BoundSql boundSql = statement.getBoundSql(args[1]);
+            String sql = boundSql.getSql() + " and rec_status = 0";
+            MappedStatement newStatement = newMappedStatement(statement, new BoundSqlSqlSource(boundSql));
+            MetaObject msObject =  MetaObject.forObject(newStatement, new DefaultObjectFactory(), new DefaultObjectWrapperFactory(),new DefaultReflectorFactory());
+            msObject.setValue("sqlSource.boundSql.sql", sql);
+            args[0] = newStatement;
+        }
+
+        return invocation.proceed();
+    }
+
+    private void addCondition(MappedStatement statement, Object example) throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, InstantiationException, ClassNotFoundException {
+        if (example instanceof Map) {
+            example = ((Map) example).get("_ORIGINAL_PARAMETER_OBJECT");
+        }
+
+
+        Method method = example.getClass().getMethod("getOredCriteria", null);
+        //获取到条件数组，第一个是Criteria
+        List list = (List) method.invoke(example);
+        if (CollectionUtil.isEmpty(list)) {
+            Class clazz = ((ResultMap) statement.getResultMaps().get(0)).getType();
+            String exampleName = clazz.getName() + "Example";
+            Object paramExample = Class.forName(exampleName).newInstance();
+            Method createCriteria = paramExample.getClass().getMethod("createCriteria");
+            Object criteria = createCriteria.invoke(paramExample);
+            Method andIsDelEqualTo = criteria.getClass().getMethod("andRecStatusEqualTo", Byte.class);
+            andIsDelEqualTo.invoke(criteria, WebConstant.REC_STATUS.Normal.value);
+            list.add(criteria);
+        } else {
+            Object criteria = list.get(0);
+            Method getCriteria = criteria.getClass().getMethod("getCriteria");
+            List params = (List) getCriteria.invoke(criteria);
+            boolean hasDel = false;
+            for (Object param : params) {
+                Method getCondition = param.getClass().getMethod("getCondition");
+                Object condition = getCondition.invoke(param);
+                if ("rec_status =".equals(condition)) {
+                    hasDel = true;
+                }
+            }
+            if (!hasDel) {
+                Method andIsDelEqualTo = criteria.getClass().getMethod("andRecStatusEqualTo", Byte.class);
+                andIsDelEqualTo.invoke(criteria, WebConstant.REC_STATUS.Normal.value);
+            }
+
+        }
+
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        return Plugin.wrap(target, this);
+    }
+
+    @Override
+    public void setProperties(Properties properties) {
+
+    }
+
+    private MappedStatement newMappedStatement(MappedStatement ms, SqlSource newSqlSource) {
+        MappedStatement.Builder builder =
+                new MappedStatement.Builder(ms.getConfiguration(), ms.getId(), newSqlSource, ms.getSqlCommandType());
+        builder.resource(ms.getResource());
+        builder.fetchSize(ms.getFetchSize());
+        builder.statementType(ms.getStatementType());
+        builder.keyGenerator(ms.getKeyGenerator());
+        if (ms.getKeyProperties() != null && ms.getKeyProperties().length != 0) {
+            StringBuilder keyProperties = new StringBuilder();
+            for (String keyProperty : ms.getKeyProperties()) {
+                keyProperties.append(keyProperty).append(",");
+            }
+            keyProperties.delete(keyProperties.length() - 1, keyProperties.length());
+            builder.keyProperty(keyProperties.toString());
+        }
+        builder.timeout(ms.getTimeout());
+        builder.parameterMap(ms.getParameterMap());
+        builder.resultMaps(ms.getResultMaps());
+        builder.resultSetType(ms.getResultSetType());
+        builder.cache(ms.getCache());
+        builder.flushCacheRequired(ms.isFlushCacheRequired());
+        builder.useCache(ms.isUseCache());
+
+        return builder.build();
+    }
+
+
+    //    定义一个内部辅助类，作用是包装sq
+    class BoundSqlSqlSource implements SqlSource {
+        private BoundSql boundSql;
+        public BoundSqlSqlSource(BoundSql boundSql) {
+            this.boundSql = boundSql;
+        }
+        @Override
+        public BoundSql getBoundSql(Object parameterObject) {
+            return boundSql;
+        }
+    }
+
+}

beneficiation/src/main/java/com/ccsens/beneficiation/persist/dao/RecordDao.java

@@ -0,0 +1,55 @@
+package com.ccsens.beneficiation.persist.dao;
+
+import com.ccsens.beneficiation.bean.po.Record;
+import com.ccsens.beneficiation.bean.vo.MessageVo;
+import com.ccsens.beneficiation.bean.vo.ParameterVo;
+import com.ccsens.beneficiation.persist.mapper.RecordMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface RecordDao extends RecordMapper {
+
+    Record getByTypeAndAuthId(@Param("type") byte type,@Param("authId")String authId);
+
+    /**
+     * 查找tall内的设备信息处理的配置信息
+     * @param startAddr 开始的addr
+     * @return 返回配置信息
+     */
+    MessageVo.AddrDispose getByStartAddr(@Param("startAddr")int startAddr,@Param("project")byte project);
+
+    /**
+     * 根据addr查找设备和信息类型
+     * @param addr 寄存器地址
+     * @return 返回设备类型和消息类型
+     */
+    MessageVo.EquipmentType getEquipmentTypeByAddr(@Param("addr")int addr);
+
+    /**
+     * 查询皮带秤和流量计的数据
+     * @return
+     */
+    List<ParameterVo.BeltWeigher> queryBeltWeigher();
+    /**
+     * 查询变频器和电磁阀的数据
+     * @return
+     */
+    List<ParameterVo.Transducer> queryTransducer();
+
+    /**
+     * 查询电耳的数据
+     * @return
+     */
+    List<ParameterVo.Parameter> queryParameter();
+
+    /**
+     *
+     * @param equipmentId
+     * @param stages
+     * @return
+     */
+    ParameterVo.ThresholdValue getThresholdValue(@Param("equipmentId")Long equipmentId, @Param("stages")int stages);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/persist/dao/WeightDao.java

@@ -0,0 +1,30 @@
+package com.ccsens.beneficiation.persist.dao;
+
+import com.ccsens.beneficiation.bean.dto.WeightDto;
+import com.ccsens.beneficiation.bean.vo.WeightVo;
+import com.ccsens.beneficiation.persist.mapper.WeightMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Repository
+public interface WeightDao extends WeightMapper {
+    /**
+     * 统计称重数据
+     * @param param
+     * @return
+     */
+    List<WeightVo.WeightDay> queryWeightDay(WeightDto.GetWeightByDay param);
+
+    /**
+     * 重量累计
+     * @param datetime
+     * @return
+     */
+    WeightVo.WeightTotal queryWeightTotal(@Param("datetime") Date datetime);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/AdjustRecordMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.beneficiation.persist.mapper;
+
+import com.ccsens.beneficiation.bean.po.AdjustRecord;
+import com.ccsens.beneficiation.bean.po.AdjustRecordExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface AdjustRecordMapper {
+    long countByExample(AdjustRecordExample example);
+
+    int deleteByExample(AdjustRecordExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AdjustRecord record);
+
+    int insertSelective(AdjustRecord record);
+
+    List<AdjustRecord> selectByExample(AdjustRecordExample example);
+
+    AdjustRecord selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") AdjustRecord record, @Param("example") AdjustRecordExample example);
+
+    int updateByExample(@Param("record") AdjustRecord record, @Param("example") AdjustRecordExample example);
+
+    int updateByPrimaryKeySelective(AdjustRecord record);
+
+    int updateByPrimaryKey(AdjustRecord record);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/EquipmentMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.beneficiation.persist.mapper;
+
+import com.ccsens.beneficiation.bean.po.Equipment;
+import com.ccsens.beneficiation.bean.po.EquipmentExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface EquipmentMapper {
+    long countByExample(EquipmentExample example);
+
+    int deleteByExample(EquipmentExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Equipment record);
+
+    int insertSelective(Equipment record);
+
+    List<Equipment> selectByExample(EquipmentExample example);
+
+    Equipment selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") Equipment record, @Param("example") EquipmentExample example);
+
+    int updateByExample(@Param("record") Equipment record, @Param("example") EquipmentExample example);
+
+    int updateByPrimaryKeySelective(Equipment record);
+
+    int updateByPrimaryKey(Equipment record);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/EquipmentTypeMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.beneficiation.persist.mapper;
+
+import com.ccsens.beneficiation.bean.po.EquipmentType;
+import com.ccsens.beneficiation.bean.po.EquipmentTypeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface EquipmentTypeMapper {
+    long countByExample(EquipmentTypeExample example);
+
+    int deleteByExample(EquipmentTypeExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(EquipmentType record);
+
+    int insertSelective(EquipmentType record);
+
+    List<EquipmentType> selectByExample(EquipmentTypeExample example);
+
+    EquipmentType selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") EquipmentType record, @Param("example") EquipmentTypeExample example);
+
+    int updateByExample(@Param("record") EquipmentType record, @Param("example") EquipmentTypeExample example);
+
+    int updateByPrimaryKeySelective(EquipmentType record);
+
+    int updateByPrimaryKey(EquipmentType record);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/RecordMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.beneficiation.persist.mapper;
+
+import com.ccsens.beneficiation.bean.po.Record;
+import com.ccsens.beneficiation.bean.po.RecordExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface RecordMapper {
+    long countByExample(RecordExample example);
+
+    int deleteByExample(RecordExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Record record);
+
+    int insertSelective(Record record);
+
+    List<Record> selectByExample(RecordExample example);
+
+    Record selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") Record record, @Param("example") RecordExample example);
+
+    int updateByExample(@Param("record") Record record, @Param("example") RecordExample example);
+
+    int updateByPrimaryKeySelective(Record record);
+
+    int updateByPrimaryKey(Record record);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/ThresholdValueMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.beneficiation.persist.mapper;
+
+import com.ccsens.beneficiation.bean.po.ThresholdValue;
+import com.ccsens.beneficiation.bean.po.ThresholdValueExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ThresholdValueMapper {
+    long countByExample(ThresholdValueExample example);
+
+    int deleteByExample(ThresholdValueExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ThresholdValue record);
+
+    int insertSelective(ThresholdValue record);
+
+    List<ThresholdValue> selectByExample(ThresholdValueExample example);
+
+    ThresholdValue selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") ThresholdValue record, @Param("example") ThresholdValueExample example);
+
+    int updateByExample(@Param("record") ThresholdValue record, @Param("example") ThresholdValueExample example);
+
+    int updateByPrimaryKeySelective(ThresholdValue record);
+
+    int updateByPrimaryKey(ThresholdValue record);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/WeightMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.beneficiation.persist.mapper;
+
+import com.ccsens.beneficiation.bean.po.Weight;
+import com.ccsens.beneficiation.bean.po.WeightExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface WeightMapper {
+    long countByExample(WeightExample example);
+
+    int deleteByExample(WeightExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Weight record);
+
+    int insertSelective(Weight record);
+
+    List<Weight> selectByExample(WeightExample example);
+
+    Weight selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") Weight record, @Param("example") WeightExample example);
+
+    int updateByExample(@Param("record") Weight record, @Param("example") WeightExample example);
+
+    int updateByPrimaryKeySelective(Weight record);
+
+    int updateByPrimaryKey(Weight record);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/rabbitMQ/RabbitController.java

@@ -0,0 +1,66 @@
+package com.ccsens.beneficiation.rabbitMQ;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.ccsens.beneficiation.bean.dto.Message.BeneficiationMessageDto;
+import com.ccsens.beneficiation.bean.vo.MessageVo;
+import com.ccsens.beneficiation.service.IRecordService;
+import com.ccsens.util.RedisUtil;
+import com.ccsens.util.bean.message.common.OutMessage;
+import com.ccsens.util.bean.message.common.OutMessageSet;
+import com.ccsens.util.config.RabbitMQConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Component
+@RabbitListener(queues = RabbitMQConfig.BENEFICIATION)
+public class RabbitController {
+    @Resource
+    private IRecordService recordService;
+
+    private Logger logger = LoggerFactory.getLogger(RabbitController.class);
+
+    @RabbitHandler
+    public void process(String messageJson) {
+        logger.info("上传消息数据: {}", messageJson);
+        try {
+            OutMessageSet outMessageSet = JSONObject.parseObject(messageJson, OutMessageSet.class);
+            if (ObjectUtil.isNull(outMessageSet)) {
+                return;
+            }
+            Set<OutMessage> messageSet = outMessageSet.getMessageSet();
+            if (CollectionUtil.isEmpty(messageSet)) {
+                return;
+            }
+            List<BeneficiationMessageDto> pendingMessage = new ArrayList<>();
+            messageSet.forEach(outMessage -> {
+                BeneficiationMessageDto carRecordMessageDto = JSONObject.parseObject(outMessage.getData(), BeneficiationMessageDto.class);
+                pendingMessage.add(carRecordMessageDto);
+            });
+            pendingMessage.sort(Comparator.comparingInt(BeneficiationMessageDto::getAddr));
+            log.info("接收到的list：{}",pendingMessage);
+            //处理下位机的信息
+            List<MessageVo.AchieveMessage> achieveMessages = recordService.processMessage(pendingMessage);
+            log.info("处理后的消息：{}",achieveMessages);
+            //根据业务处理保存消息
+            recordService.saveRecord(achieveMessages);
+
+        } catch (Exception e) {
+            log.error("消息JSON转换异常", e);
+        }
+    }
+
+
+}

beneficiation/src/main/java/com/ccsens/beneficiation/service/IMessageService.java

@@ -0,0 +1,7 @@
+package com.ccsens.beneficiation.service;
+
+import com.ccsens.util.bean.message.common.InMessage;
+
+public interface IMessageService {
+    void sendToCarRecord(InMessage inMessage) throws Exception;
+}

beneficiation/src/main/java/com/ccsens/beneficiation/service/IParameterService.java

@@ -0,0 +1,23 @@
+package com.ccsens.beneficiation.service;
+
+import com.ccsens.beneficiation.bean.dto.ParameterDto;
+import com.ccsens.beneficiation.bean.vo.ParameterVo;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+/**
+ * @author 逗
+ */
+public interface IParameterService {
+    /**
+     * 查询每个设备的参数
+     * @param param 没有参数
+     * @return 返回每个设备的数据
+     */
+    ParameterVo.QueryParameter queryParameter(Object param);
+
+    /**
+     * 修改一起的参数
+     * @param param 参数
+     */
+    void updateParameter(ParameterDto.ParameterInfo param) throws JsonProcessingException, Exception;
+}

beneficiation/src/main/java/com/ccsens/beneficiation/service/IRecordService.java

@@ -0,0 +1,20 @@
+package com.ccsens.beneficiation.service;
+
+import com.ccsens.beneficiation.bean.dto.Message.BeneficiationMessageDto;
+import com.ccsens.beneficiation.bean.vo.MessageVo;
+
+import java.util.List;
+
+public interface IRecordService {
+
+    /**
+     * 处理消息消息
+     */
+    List<MessageVo.AchieveMessage> processMessage(List<BeneficiationMessageDto> carRecordMessageDto);
+
+    /**
+     * 根据业务保存处理插件
+     * @param achieveMessages
+     */
+    void saveRecord(List<MessageVo.AchieveMessage> achieveMessages);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/service/IWeightService.java

@@ -0,0 +1,25 @@
+package com.ccsens.beneficiation.service;
+
+import com.ccsens.beneficiation.bean.dto.WeightDto;
+import com.ccsens.beneficiation.bean.vo.WeightVo;
+
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+public interface IWeightService {
+    /**
+     * 统计每天的重量数据
+     * @param param 设备id和开始结束时间
+     * @return 返回每天的称重信息
+     */
+    List<WeightVo.WeightDay> queryWeightDay(WeightDto.GetWeightByDay param);
+
+    /**
+     * 重量累计
+     * @param param 日期
+     * @return 返回 天 周 月 年 分别的累计
+     */
+    WeightVo.WeightTotal queryWeightTotal(WeightDto.GetWeightTotal param);
+}

beneficiation/src/main/java/com/ccsens/beneficiation/service/MessageService.java

@@ -0,0 +1,28 @@
+package com.ccsens.beneficiation.service;
+
+import com.ccsens.util.JacksonUtil;
+import com.ccsens.util.bean.message.common.InMessage;
+import com.ccsens.util.config.RabbitMQConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class MessageService implements IMessageService{
+    @Autowired
+    private AmqpTemplate rabbitTemplate;
+
+    @Override
+    public void sendToCarRecord(InMessage inMessage) throws Exception{
+//        log.info(JacksonUtil.beanToJson(inMessage));
+        //FixMe 发送到消息队列
+        rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME,
+                JacksonUtil.beanToJson(inMessage));
+        log.info("发送到消息队列：{}",JacksonUtil.beanToJson(inMessage));
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java

@@ -0,0 +1,294 @@
+package com.ccsens.beneficiation.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.beneficiation.bean.dto.ParameterDto;
+import com.ccsens.beneficiation.bean.po.EquipmentType;
+import com.ccsens.beneficiation.bean.po.EquipmentTypeExample;
+import com.ccsens.beneficiation.bean.vo.ParameterVo;
+import com.ccsens.beneficiation.persist.dao.RecordDao;
+import com.ccsens.beneficiation.persist.mapper.EquipmentTypeMapper;
+import com.ccsens.beneficiation.util.Constant;
+import com.ccsens.util.CRCUtil;
+import com.ccsens.util.bean.message.common.InMessage;
+import com.ccsens.util.bean.message.common.MessageConstant;
+import com.ccsens.util.bean.message.common.MessageRule;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class ParameterService implements IParameterService{
+    @Resource
+    private RecordDao recordDao;
+    @Resource
+    private EquipmentTypeMapper equipmentTypeMapper;
+    @Resource
+    private IMessageService messageService;
+
+    @Override
+    public ParameterVo.QueryParameter queryParameter(Object param) {
+        //查询电耳，皮带秤，流量计，电磁阀，变频器的数据
+        ParameterVo.QueryParameter parameterInfo = new ParameterVo.QueryParameter();
+        //查询皮带秤和流量计的数据
+        List<ParameterVo.BeltWeigher> beltWeighers = recordDao.queryBeltWeigher();
+        if(CollectionUtil.isNotEmpty(beltWeighers)){
+            beltWeighers.forEach(beltWeigher -> {
+                if(CollectionUtil.isNotEmpty(beltWeigher.getValues())){
+                    int i = beltWeigher.getValues().size() <= 1 ? 0 : 1;
+                    for (ParameterVo.BeltWeigherValue value : beltWeigher.getValues()) {
+                        String a = i == 0 ? "" : Integer.toString(i);
+                        value.setKey("实时/累计" + a);
+                        i++;
+                    }
+                }
+            });
+        }
+        parameterInfo.setBeltWeigher(beltWeighers);
+        //查询变频器和电磁阀
+        List<ParameterVo.Transducer> transducers = recordDao.queryTransducer();
+        if(CollectionUtil.isNotEmpty(transducers)){
+            transducers.forEach(transducer -> {
+                String type = "变频器".equalsIgnoreCase(transducer.getTitle()) ? "transducer" : "solenoidValue";
+                int x = "变频器".equalsIgnoreCase(transducer.getTitle()) ? 0 : 1;
+                if(CollectionUtil.isNotEmpty(transducer.getValues())){
+                    int i = transducer.getValues().size() <= 1 ? 0 : 1;
+                    for (ParameterVo.TransducerValue value : transducer.getValues()) {
+                        String a = i == 0 ? "" : Integer.toString(i);
+                        value.setKey("实时/设置" + a);
+                        value.setType(type + a);
+                        BigDecimal currentTime;
+                        if(x == 0){
+                            currentTime = value.getCurrentTimeValue().divide(BigDecimal.valueOf(100), 0, BigDecimal.ROUND_HALF_UP);
+                        }else {
+                            currentTime = value.getCurrentTimeValue().divide(BigDecimal.valueOf(10),1,BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(4));
+                        }
+                        value.setCurrentTimeValue(currentTime);
+                        i++;
+                    }
+                }
+            });
+        }
+        parameterInfo.setTransducers(transducers);
+        //查询电耳
+        List<ParameterVo.Parameter> parameters = recordDao.queryParameter();
+        if(CollectionUtil.isNotEmpty(parameters)){
+            parameters.forEach(parameter -> {
+                if(CollectionUtil.isNotEmpty(parameter.getValues())){
+                    int i = parameter.getValues().size() <= 1 ? 0 : 1;
+                    for (ParameterVo.ParameterThreshold value : parameter.getValues()) {
+                        String a = i == 0 ? "" : Integer.toString(i);
+                        value.setKey("实时" + a);
+                        value.setType("thresholdValue" + a);
+                        //查询设备的阀值1
+                        ParameterVo.ThresholdValue thresholdValue1 = recordDao.getThresholdValue(value.getId(), 1);
+                        if(ObjectUtil.isNull(thresholdValue1)){
+                            thresholdValue1 = new ParameterVo.ThresholdValue("thresholdValue1","阀值1");
+                        }
+                        value.setThresholdValue1(thresholdValue1);
+
+                        //阀值2
+                        ParameterVo.ThresholdValue thresholdValue2 = recordDao.getThresholdValue(value.getId(), 1);
+                        if(ObjectUtil.isNull(thresholdValue2)){
+                            thresholdValue2 = new ParameterVo.ThresholdValue("thresholdValue2","阀值2");
+                        }
+                        value.setThresholdValue2(thresholdValue2);
+
+                        //阀值3
+                        ParameterVo.ThresholdValue thresholdValue3 = recordDao.getThresholdValue(value.getId(), 1);
+                        if(ObjectUtil.isNull(thresholdValue3)){
+                            thresholdValue3 = new ParameterVo.ThresholdValue("thresholdValue3","阀值3");
+                        }
+                        value.setThresholdValue3(thresholdValue3);
+                        i++;
+                    }
+                }
+            });
+        }
+        parameterInfo.setParameter(parameters);
+
+        return parameterInfo;
+    }
+
+    @Override
+    public void updateParameter(ParameterDto.ParameterInfo param) throws Exception {
+        if(ObjectUtil.isNull(param)){
+            return;
+        }
+        //电磁阀1
+        ParameterDto.Parameter solenoidValue1 = param.getSolenoidValue1();
+        if(ObjectUtil.isNotNull(solenoidValue1)) {
+            if (ObjectUtil.isNotNull(solenoidValue1.getSettingValue())) {
+                solenoidValue1.setSettingValue(solenoidValue1.getSettingValue().multiply(BigDecimal.valueOf(100)));
+            }
+            transducer(solenoidValue1);
+        }
+        //电磁阀2
+        ParameterDto.Parameter solenoidValue2 = param.getSolenoidValue2();
+        if(ObjectUtil.isNotNull(solenoidValue2)){
+            if(ObjectUtil.isNotNull(solenoidValue2.getSettingValue())){
+                solenoidValue2.setSettingValue(solenoidValue2.getSettingValue().multiply(BigDecimal.valueOf(100)));
+            }
+            transducer(solenoidValue2);
+        }
+
+        //变频器1
+        ParameterDto.Parameter transducer1 = param.getTransducer1();
+        if(ObjectUtil.isNotNull(transducer1)) {
+            if (ObjectUtil.isNotNull(transducer1.getSettingValue())) {
+                transducer1.setSettingValue(transducer1.getSettingValue().add(BigDecimal.valueOf(4)));
+            }
+            transducer(transducer1);
+        }
+        //变频器2
+        ParameterDto.Parameter transducer2 = param.getTransducer1();
+        if(ObjectUtil.isNotNull(transducer2)) {
+            if (ObjectUtil.isNotNull(transducer2.getSettingValue())) {
+                transducer2.setSettingValue(transducer2.getSettingValue().add(BigDecimal.valueOf(4)));
+            }
+            transducer(transducer2);
+        }
+        //变频器3
+        ParameterDto.Parameter transducer3 = param.getTransducer1();
+        if(ObjectUtil.isNotNull(transducer3)) {
+            if (ObjectUtil.isNotNull(transducer3.getSettingValue())) {
+                transducer3.setSettingValue(transducer3.getSettingValue().add(BigDecimal.valueOf(4)));
+            }
+            transducer(transducer3);
+        }
+        //变频器4
+        ParameterDto.Parameter transducer4 = param.getTransducer1();
+        if(ObjectUtil.isNotNull(transducer4)) {
+            if (ObjectUtil.isNotNull(transducer4.getSettingValue())) {
+                transducer4.setSettingValue(transducer4.getSettingValue().add(BigDecimal.valueOf(4)));
+            }
+            transducer(transducer4);
+        }
+
+        //电耳1
+        ParameterDto.ParameterThreshold electricEar1 = param.getElectricEar1();
+        electric(electricEar1);
+        //电耳2
+        ParameterDto.ParameterThreshold electricEar2 = param.getElectricEar2();
+        electric(electricEar2);
+
+    }
+
+    private void transducer(ParameterDto.Parameter transducer3) throws Exception {
+        if (ObjectUtil.isNotNull(transducer3)) {
+            if (ObjectUtil.isNotNull(transducer3.getSettingValue())) {
+                getBytes(transducer3.getId(), transducer3.getSettingValue().intValue(), Constant.Type.SET_VALUE);
+            }
+        }
+    }
+
+    private void electric(ParameterDto.ParameterThreshold electricEar) throws Exception {
+        if (ObjectUtil.isNotNull(electricEar)) {
+            //最低值
+            if (ObjectUtil.isNotNull(electricEar.getThresholdValue1())) {
+                ParameterDto.Threshold threshold = electricEar.getThresholdValue1();
+                //低
+                if (ObjectUtil.isNotNull(threshold.getMinValue())) {
+                    getBytes(electricEar.getId(), threshold.getMinValue().intValue(), Constant.Type.MINIMUM_VALUE_MIN);
+                }
+                //高
+                if (ObjectUtil.isNotNull(threshold.getMaxValue())) {
+                    getBytes(electricEar.getId(), threshold.getMaxValue().intValue(), Constant.Type.MINIMUM_VALUE_MAX);
+                }
+            }
+            //理想值
+            if (ObjectUtil.isNotNull(electricEar.getThresholdValue2())) {
+                ParameterDto.Threshold threshold = electricEar.getThresholdValue2();
+                //低
+                if (ObjectUtil.isNotNull(threshold.getMinValue())) {
+                    getBytes(electricEar.getId(), threshold.getMinValue().intValue(), Constant.Type.MINIMUM_VALUE_MIN);
+                }
+                //高
+                if (ObjectUtil.isNotNull(threshold.getMaxValue())) {
+                    getBytes(electricEar.getId(), threshold.getMaxValue().intValue(), Constant.Type.MINIMUM_VALUE_MAX);
+                }
+            }
+            //最高值
+            if (ObjectUtil.isNotNull(electricEar.getThresholdValue3())) {
+                ParameterDto.Threshold threshold = electricEar.getThresholdValue3();
+                //低
+                if (ObjectUtil.isNotNull(threshold.getMinValue())) {
+                    getBytes(electricEar.getId(), threshold.getMinValue().intValue(), Constant.Type.MINIMUM_VALUE_MIN);
+                }
+                //高
+                if (ObjectUtil.isNotNull(threshold.getMaxValue())) {
+                    getBytes(electricEar.getId(), threshold.getMaxValue().intValue(), Constant.Type.MINIMUM_VALUE_MAX);
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取设置值的byte数组 并发送消息
+     */
+    private void getBytes(Long id, int value,byte type) throws Exception {
+        //根据id和数据类型 查找该设备的addr 设置值是1
+        EquipmentTypeExample equipmentTypeExample = new EquipmentTypeExample();
+        equipmentTypeExample.createCriteria().andEquipmentIdEqualTo(id).andTypeEqualTo(type);
+        List<EquipmentType> equipmentTypes = equipmentTypeMapper.selectByExample(equipmentTypeExample);
+        if(CollectionUtil.isNotEmpty(equipmentTypes)){
+            EquipmentType equipmentType = equipmentTypes.get(0);
+            log.info("查找设备配置信息：{}",equipmentType);
+
+            byte[] header = new byte[]{(byte)0xff,(byte)0xfe,(byte)0x00};
+
+            byte uc1 = (byte) (value >> 8);
+            byte uc2 = (byte) (value & 0xff);
+            log.info("计算value的高低值：{}---{}",uc1,uc2);
+
+            byte addr1 = (byte) (equipmentType.getAddr() >> 8);
+            byte addr2 = (byte) (equipmentType.getAddr() & 0xff);
+            log.info("计算addr的高低值：{}---{}",addr1,addr2);
+
+//            byte[] center = new byte[]{(byte)0x10,(byte)0x10,addr1,addr2,uc1,uc2};
+            byte[] center = new byte[]{(byte)0x10,(byte)0x10,addr1,addr2,0x00,0x01,0x02,uc1,uc2};
+
+            byte[] crc = new byte[2];
+            CRCUtil.crc16(crc,center,0,center.length);
+            log.info("计算crc校验：{}---{}",crc[0],crc[1]);
+
+            byte[] all = new byte[header.length + center.length + crc.length];
+            System.arraycopy(header,0,all,0,header.length);
+            System.arraycopy(center,0,all,header.length,center.length);
+            System.arraycopy(crc,0,all,header.length + center.length,crc.length);
+
+            all[2] = (byte) (all.length - 3);
+            for (int i = 0; i < all.length; i++) {
+                log.info("发送数据:{}",Integer.toHexString(all[i] & 0xFF));
+            }
+            sendInMessage(all);
+        }
+    }
+
+
+    /**
+     * 生成InMessage消息并发送
+     */
+    private void sendInMessage(byte[] all) throws Exception {
+        Set<String> userIdSet = new HashSet<>();
+//        userIdSet.add(String.valueOf(1));
+        userIdSet.add(String.valueOf(2));
+        MessageRule messageRule = MessageRule.defaultRule(MessageConstant.DomainType.User);
+        messageRule.setAckRule(MessageRule.AckRule.NONE);
+        messageRule.setOfflineDiscard((byte) 1);
+        String s = Arrays.toString(all);
+        InMessage inMessage = InMessage.newToUserMessage(null,userIdSet,null,messageRule,s);
+        //发送消息
+        messageService.sendToCarRecord(inMessage);
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/service/RecordService.java

@@ -0,0 +1,166 @@
+package com.ccsens.beneficiation.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.beneficiation.bean.dto.Message.BeneficiationMessageDto;
+import com.ccsens.beneficiation.bean.po.*;
+import com.ccsens.beneficiation.bean.po.Record;
+import com.ccsens.beneficiation.bean.vo.MessageVo;
+import com.ccsens.beneficiation.persist.dao.RecordDao;
+import com.ccsens.beneficiation.persist.mapper.ThresholdValueMapper;
+import com.ccsens.beneficiation.persist.mapper.WeightMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class RecordService implements IRecordService{
+    @Resource
+    private RecordDao recordDao;
+    @Resource
+    private Snowflake snowflake;
+    @Resource
+    private WeightMapper weightMapper;
+    @Resource
+    private ThresholdValueMapper thresholdValueMapper;
+
+
+    /**
+     * 处理下位机消息
+     */
+    @Override
+    public List<MessageVo.AchieveMessage> processMessage(List<BeneficiationMessageDto> messageDtoList) {
+        List<MessageVo.AchieveMessage> achieveMessages = new ArrayList<>();
+        log.info("");
+        int i = 0;
+        while (i < messageDtoList.size()){
+            BeneficiationMessageDto messageDto = messageDtoList.get(i);
+            //获取该设备的消息处理配置
+            MessageVo.AddrDispose addrDispose = recordDao.getByStartAddr(messageDto.getAddr(), (byte) 1);
+            String[] split = addrDispose.getContentLength().split(",");
+            if(split.length == 0){
+                i++;
+                continue;
+            }
+            for (String s : split) {
+                if(Integer.parseInt(s) == 0){
+                    i++;
+                    continue;
+                }
+                MessageVo.AchieveMessage achieveMessage = new MessageVo.AchieveMessage();
+                achieveMessage.setAddr(messageDto.getAddr());
+                int value = 0;
+                for (int j = 0; j < Integer.parseInt(s); j++) {
+                    value += messageDtoList.get(i + j).getValue();
+                }
+                achieveMessage.setValue(value);
+                achieveMessages.add(achieveMessage);
+                i += Integer.parseInt(s);
+            }
+        }
+
+        return achieveMessages;
+    }
+
+    @Override
+    public void saveRecord(List<MessageVo.AchieveMessage> achieveMessages) {
+        if(CollectionUtil.isNotEmpty(achieveMessages)){
+            achieveMessages.forEach(achieveMessage -> {
+                //根据addr查找消息类型和设备类型
+                MessageVo.EquipmentType equipmentType = recordDao.getEquipmentTypeByAddr(achieveMessage.getAddr());
+                if(ObjectUtil.isNull(equipmentType)){
+                    return;
+                }
+                log.info("每条数据都存入记录表");
+                saveRecord(achieveMessage.getValue(), equipmentType.getId(),equipmentType.getMessageType());
+                //皮带秤的累计值
+                if(equipmentType.getEquipmentType() == 4){
+                    //累计值存入重量表
+                    if(equipmentType.getMessageType() == 2){
+                        log.info("保存皮带秤累计值");
+                        Weight weight = new Weight();
+                        weight.setId(snowflake.nextId());
+                        weight.setTime(new Date());
+                        weight.setEquipmentId(equipmentType.getId());
+                        weight.setWeight(achieveMessage.getValue().toString());
+                        weightMapper.insertSelective(weight);
+                    }
+                }
+                //阀值
+                Integer min;
+                Integer max;
+                switch (equipmentType.getMessageType()){
+                    case 3:
+                    case 8:
+                        min = equipmentType.getMessageType() == 3 ? achieveMessage.getValue() : null;
+                        max = equipmentType.getMessageType() == 8 ? achieveMessage.getValue() : null;
+
+                        setThreshold(equipmentType.getId(), (byte) 1, min, max);
+                        break;
+                    case 4:
+                    case 9:
+                        min = equipmentType.getMessageType() == 4 ? achieveMessage.getValue() : null;
+                        max = equipmentType.getMessageType() == 9 ? achieveMessage.getValue() : null;
+
+                        setThreshold(equipmentType.getId(), (byte) 2, min, max);
+                        break;
+                    case 5:
+                    case 10:
+                        min = equipmentType.getMessageType() == 5 ? achieveMessage.getValue() : null;
+                        max = equipmentType.getMessageType() == 10 ? achieveMessage.getValue() : null;
+
+                        setThreshold(equipmentType.getId(), (byte) 3, min, max);
+                        break;
+                    default:
+                        break;
+                }
+            });
+        }
+    }
+
+    private void setThreshold(Long equipmentId, byte stages, Integer min, Integer max) {
+        ThresholdValue thresholdValue;
+        ThresholdValueExample thresholdValueExample = new ThresholdValueExample();
+        thresholdValueExample.createCriteria().andEquipmentIdEqualTo(equipmentId).andStagesEqualTo(stages);
+        thresholdValueExample.setOrderByClause("created_at DESC limit 1");
+        List<ThresholdValue> thresholdValueList = thresholdValueMapper.selectByExample(thresholdValueExample);
+        if(CollectionUtil.isNotEmpty(thresholdValueList)){
+            thresholdValue = thresholdValueList.get(0);
+            thresholdValue.setMin(min);
+            thresholdValue.setMax(max);
+            thresholdValueMapper.updateByPrimaryKeySelective(thresholdValue);
+        }else {
+            thresholdValue = new ThresholdValue();
+            thresholdValue.setId(snowflake.nextId());
+            thresholdValue.setEquipmentId(equipmentId);
+            thresholdValue.setStages(stages);
+            thresholdValue.setMin(min);
+            thresholdValue.setMax(max);
+            thresholdValueMapper.insertSelective(thresholdValue);
+        }
+    }
+
+
+    private void saveRecord(int value, Long equipmentId, Byte messageType) {
+        Record record = new Record();
+        record.setId(snowflake.nextId());
+        record.setTime(new Date());
+        record.setEquipmentId(equipmentId);
+        record.setValue(value);
+        record.setType(messageType);
+        log.info("存入记录表：{}",record);
+        recordDao.insertSelective(record);
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/service/WeightService.java

@@ -0,0 +1,33 @@
+package com.ccsens.beneficiation.service;
+
+import com.ccsens.beneficiation.bean.dto.WeightDto;
+import com.ccsens.beneficiation.bean.vo.WeightVo;
+import com.ccsens.beneficiation.persist.dao.WeightDao;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Service
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class WeightService implements IWeightService{
+    @Resource
+    private WeightDao weightDao;
+
+    @Override
+    public List<WeightVo.WeightDay> queryWeightDay(WeightDto.GetWeightByDay param) {
+        return weightDao.queryWeightDay(param);
+    }
+
+    @Override
+    public WeightVo.WeightTotal queryWeightTotal(WeightDto.GetWeightTotal param) {
+        return weightDao.queryWeightTotal(param.getDatetime());
+    }
+}

beneficiation/src/main/java/com/ccsens/beneficiation/util/Constant.java

@@ -0,0 +1,56 @@
+package com.ccsens.beneficiation.util;
+
+
+/**
+ * @author 逗
+ */
+public class Constant {
+    /**注册来源*/
+    public static final class Type {
+        /**
+         * 实时值
+         */
+        public final static byte REAL_VALUE = 0;
+        /**
+         * 设置值
+         */
+        public final static byte SET_VALUE = 1;
+        /**
+         * 累计值
+         */
+        public final static byte AGGREGATE_VALUE = 2;
+        /**
+         * 最低值——低
+         */
+        public final static byte MINIMUM_VALUE_MIN = 3;
+        /**
+         * 最低值——高
+         */
+        public final static byte MINIMUM_VALUE_MAX = 8;
+        /**
+         * 理想值——低
+         */
+        public final static byte IDEAL_VALUE_MIN  = 4;
+        /**
+         * 理想值——高
+         */
+        public final static byte IDEAL_VALUE_MAX = 9;
+        /**
+         * 最高值——低
+         */
+        public final static byte MAXIMUM_VALUE_MIN = 5;
+        /**
+         * 最高值——高
+         */
+        public final static byte MAXIMUM_VALUE_MAX = 10;
+        /**
+         * 迟滞
+         */
+        public final static byte HYSTERESIS = 6;
+        /**
+         * 迟滞
+         */
+        public final static byte OTHER = 7;
+    }
+
+}

beneficiation/src/main/resources/application-common.yml

@@ -0,0 +1,30 @@
+logging:
+  level:
+    com:
+      favorites: DEBUG
+    org:
+      hibernate: ERROR
+      springframework:
+        web: DEBUG
+mybatis:
+  config-location: classpath:mybatis/mybatis-config.xml
+  mapper-locations: classpath*:mapper_*/*.xml
+  type-aliases-package: com.ccsens.mtpro.bean
+#server:
+#  tomcat:
+#    uri-encoding: UTF-8
+spring:
+  http:
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+    log-request-details: true
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 100MB
+  snowflake:
+    datacenterId: 2
+    workerId: 2
+

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

@@ -0,0 +1,37 @@
+server:
+  port: 7140
+  servlet:
+    context-path:
+spring:
+  application:
+    name: beneficiation
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+  rabbitmq:
+#    host: 192.144.182.42
+#    host: test.tall.wiki
+    host: 127.0.0.1
+    password: guest
+    port: 5672
+    username: guest
+  redis:
+    database: 0
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: 200
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+    password: ''
+    port: 6379
+    timeout: 1000ms
+swagger:
+  enable: true
+file:
+  path: /home/cloud/beneficiation/uploads/
+  domain: https://test.tall.wiki/gateway/mt/
+  imgDomain: https://test.tall.wiki/gateway/beneficiation/uploads/
+#gameMqName: game_status_wisdom
+logging:
+  path:

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

@@ -0,0 +1,40 @@
+server:
+  port: 7140
+  servlet:
+    context-path:
+spring:
+  application:
+    name: beneficiation
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+  rabbitmq:
+    host: 127.0.0.1
+    password: 111111
+    port: 5672
+    username: admin
+  redis:
+    database: 0
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: 200
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+#    password: ''
+    password: 'areowqr!@43ef'
+    port: 6379
+    timeout: 1000ms
+swagger:
+  enable: true
+eureka:
+  instance:
+    ip-address: 121.36.3.207
+
+gatewayUrl: https://www.tall.wiki/gateway/
+notGatewayUrl: https://www.tall.wiki/
+file:
+  path: /home/cloud/beneficiation/uploads/
+  signUpUrl: https://www.tall.wiki/compete/
+  domain: https://www.tall.wiki/gateway/beneficiation/
+  imgDomain: https://www.tall.wiki/gateway/beneficiation/uploads/

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

@@ -0,0 +1,36 @@
+server:
+  port: 7140
+  servlet:
+    context-path:
+spring:
+  application:
+    name: beneficiation
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+  rabbitmq:
+    host: 127.0.0.1
+    password: 111111
+    port: 5672
+    username: admin
+  redis:
+    database: 0
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: 200
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
+    password: ''
+    port: 6379
+    timeout: 1000ms
+swagger:
+  enable: true
+eureka:
+  instance:
+    ip-address: 127.0.0.1
+file:
+  path: /home/cloud/beneficiation/uploads/
+  signUpUrl: https://test.tall.wiki/compete/
+  domain: https://test.tall.wiki/gateway/beneficiation/
+  imgDomain: https://test.tall.wiki/gateway/beneficiation/uploads/

beneficiation/src/main/resources/application.yml

@@ -0,0 +1,6 @@
+spring:
+  profiles:
+    active: test
+    include: common, util-test
+
+

beneficiation/src/main/resources/druid-dev.yml

@@ -0,0 +1,36 @@
+spring:
+  datasource:
+    druid:
+      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      driverClassName: com.mysql.cj.jdbc.Driver
+      dynamicUrl: jdbc:mysql://localhost:3306/${schema}
+      filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
+      filterName: druidFilter
+      filterProfileEnable: true
+      filterUrlPattern: /*
+      filters: stat,wall
+      initialSize: 5
+      maxActive: 20
+      maxPoolPreparedStatementPerConnectionSize: 20
+      maxWait: 60000
+      minEvictableIdleTimeMillis: 300000
+      minIdle: 5
+#      password: 37080c1f223685592316b02dad8816c019290a476e54ebb638f9aa3ba8b6bdb9
+      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+      poolPreparedStatements: true
+      servletLogSlowSql: true
+      servletLoginPassword: 111111
+      servletLoginUsername: druid
+      servletName: druidServlet
+      servletResetEnable: true
+      servletUrlMapping: /druid/*
+      testOnBorrow: false
+      testOnReturn: false
+      testWhileIdle: true
+      timeBetweenEvictionRunsMillis: 60000
+      url: jdbc:mysql://49.233.89.188:3306/beneficiation?useUnicode=true&characterEncoding=UTF-8
+#      url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8
+      username: root
+      validationQuery: SELECT 1 FROM DUAL
+#      env: CCSENS_GAME
+      env: CCSENS_TALL

beneficiation/src/main/resources/druid-prod.yml

@@ -0,0 +1,33 @@
+spring:
+  datasource:
+    druid:
+      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      driverClassName: com.mysql.cj.jdbc.Driver
+      dynamicUrl: jdbc:mysql://localhost:3306/${schema}
+      filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
+      filterName: druidFilter
+      filterProfileEnable: true
+      filterUrlPattern: /*
+      filters: stat,wall
+      initialSize: 5
+      maxActive: 20
+      maxPoolPreparedStatementPerConnectionSize: 20
+      maxWait: 60000
+      minEvictableIdleTimeMillis: 300000
+      minIdle: 5
+      password:
+      poolPreparedStatements: true
+      servletLogSlowSql: true
+      servletLoginPassword: 111111
+      servletLoginUsername: druid
+      servletName: druidServlet
+      servletResetEnable: true
+      servletUrlMapping: /druid/*
+      testOnBorrow: false
+      testOnReturn: false
+      testWhileIdle: true
+      timeBetweenEvictionRunsMillis: 60000
+      url: jdbc:mysql://127.0.0.1/beneficiation?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      username: root
+      validationQuery: SELECT 1 FROM DUAL
+      env: CCSENS_GAME

beneficiation/src/main/resources/druid-test.yml

@@ -0,0 +1,33 @@
+spring:
+  datasource:
+    druid:
+      connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+      driverClassName: com.mysql.cj.jdbc.Driver
+      dynamicUrl: jdbc:mysql://localhost:3306/${schema}
+      filterExclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
+      filterName: druidFilter
+      filterProfileEnable: true
+      filterUrlPattern: /*
+      filters: stat,wall
+      initialSize: 5
+      maxActive: 20
+      maxPoolPreparedStatementPerConnectionSize: 20
+      maxWait: 60000
+      minEvictableIdleTimeMillis: 300000
+      minIdle: 5
+      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+      poolPreparedStatements: true
+      servletLogSlowSql: true
+      servletLoginPassword: 111111
+      servletLoginUsername: druid
+      servletName: druidServlet
+      servletResetEnable: true
+      servletUrlMapping: /druid/*
+      testOnBorrow: false
+      testOnReturn: false
+      testWhileIdle: true
+      timeBetweenEvictionRunsMillis: 60000
+      url: jdbc:mysql://test.tall.wiki/beneficiation?useUnicode=true&characterEncoding=UTF-8
+      username: root
+      validationQuery: SELECT 1 FROM DUAL
+      env: CCSENS_TALL

beneficiation/src/main/resources/logback-spring.xml

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
+<!-- scan:当此属性设置为true时，配置文件如果发生改变，将会被重新加载，默认值为true -->
+<!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
+<!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
+<configuration  scan="true" scanPeriod="10 seconds">
+
+    <!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->
+
+    <contextName>logback</contextName>
+    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
+    <property name="log.path" value="/home/cloud/ore/log/" />
+
+    <!-- 彩色日志 -->
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+
+    <!--输出到控制台-->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>info</level>
+        </filter>
+        <encoder>
+            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+            <!-- 设置字符集 -->
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+
+    <!--输出到文件-->
+
+    <!-- 时间滚动输出 level为 DEBUG 日志 -->
+    <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${log.path}/log_debug.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志归档 -->
+            <fileNamePattern>${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 时间滚动输出 level为 INFO 日志 -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${log.path}/log_info.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 每天日志归档路径以及格式 -->
+            <fileNamePattern>${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>info</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 时间滚动输出 level为 WARN 日志 -->
+    <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${log.path}/log_warn.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>warn</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+
+    <!-- 时间滚动输出 level为 ERROR 日志 -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${log.path}/log_error.log</file>
+        <!--日志文件输出格式-->
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+        <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+        </rollingPolicy>
+        <!-- 此日志文件只记录ERROR级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--
+        <logger>用来设置某一个包或者具体的某一个类的日志打印级别、
+        以及指定<appender>。<logger>仅有一个name属性，
+        一个可选的level和一个可选的addtivity属性。
+        name:用来指定受此logger约束的某一个包或者具体的某一个类。
+        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
+              还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。
+              如果未设置此属性，那么当前logger将会继承上级的级别。
+        addtivity:是否向上级logger传递打印信息。默认是true。
+    -->
+    <!--<logger name="org.springframework.web" level="info"/>-->
+    <!--<logger name="org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor" level="INFO"/>-->
+    <!--
+        使用mybatis的时候，sql语句是debug下才会打印，而这里我们只配置了info，所以想要查看sql语句的话，有以下两种操作：
+        第一种把<root level="info">改成<root level="DEBUG">这样就会打印sql，不过这样日志那边会出现很多其他消息
+        第二种就是单独给dao下目录配置debug模式，代码如下，这样配置sql语句会打印，其他还是正常info级别：
+     -->
+
+
+    <!--
+        root节点是必选节点，用来指定最基础的日志输出级别，只有一个level属性
+        level:用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，
+        不能设置为INHERITED或者同义词NULL。默认是DEBUG
+        可以包含零个或多个元素，标识这个appender将会添加到这个logger。
+    -->
+
+    <!--开发环境:打印控制台-->
+    <springProfile name="dev">
+        <logger name="com.ccsens.ptpro.persist.*" level="debug"/>
+    </springProfile>
+
+    <root level="info">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="DEBUG_FILE" />
+        <appender-ref ref="INFO_FILE" />
+        <appender-ref ref="WARN_FILE" />
+        <appender-ref ref="ERROR_FILE" />
+    </root>
+
+    <!--生产环境:输出到文件-->
+    <!--<springProfile name="pro">-->
+    <!--<root level="info">-->
+    <!--<appender-ref ref="CONSOLE" />-->
+    <!--<appender-ref ref="DEBUG_FILE" />-->
+    <!--<appender-ref ref="INFO_FILE" />-->
+    <!--<appender-ref ref="ERROR_FILE" />-->
+    <!--<appender-ref ref="WARN_FILE" />-->
+    <!--</root>-->
+    <!--</springProfile>-->
+
+</configuration>

beneficiation/src/main/resources/mapper_dao/RecordDao.xml

@@ -0,0 +1,148 @@
+<?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.ccsens.beneficiation.persist.dao.RecordDao">
+
+
+	<select id="getByTypeAndAuthId" resultType="com.ccsens.beneficiation.bean.po.Record">
+		SELECT
+		*
+		FROM
+		t_record r LEFT JOIN t_equipment e on r.equipment_id = e.id
+		WHERE
+		e.type = #{type}
+		and e.auth_id = #{authId}
+		and r.rec_status = 0
+		and e.rec_status = 0
+		ORDER BY r.time DESC
+		LIMIT 1
+	</select>
+    <select id="getByStartAddr" resultType="com.ccsens.beneficiation.bean.vo.MessageVo$AddrDispose">
+		SELECT
+		id,
+		start_addr,
+		end_addr,
+		content_num,
+		content_length
+		FROM
+		tall.t_util_addr_dispose
+		WHERE
+		start_addr = #{startAddr}
+		and project = #{project}
+		and rec_status = 0
+		limit 1
+	</select>
+	<select id="getEquipmentTypeByAddr" resultType="com.ccsens.beneficiation.bean.vo.MessageVo$EquipmentType">
+		SELECT
+		e.id,
+		e.type as equipmentType,
+		t.type as messageType
+		from
+		t_equipment_type t
+		LEFT JOIN t_equipment e
+		on t.equipment_id = e.id and e.rec_status = 0
+		WHERE
+		t.addr = #{addr}
+		and t.rec_status = 0
+	</select>
+
+	<resultMap id="queryBeltWeigher" type="com.ccsens.beneficiation.bean.vo.ParameterVo$BeltWeigher">
+	<id column="title" property="title"/>
+	<collection property="values" ofType="com.ccsens.beneficiation.bean.vo.ParameterVo$BeltWeigherValue">
+		<id column="id" property="id"/>
+		<result column="currentTimeValue" property="currentTimeValue"/>
+		<result column="totalValue" property="totalValue"/>
+	</collection>
+	</resultMap>
+    <select id="queryBeltWeigher" resultMap="queryBeltWeigher">
+		SELECT
+		e.id,
+		if(e.type = 3,'流量计','皮带秤') as title,
+		(
+			SELECT `value` FROM t_record WHERE
+			equipment_id = e.id and type = 0 and rec_status = 0
+			ORDER BY time DESC
+			limit 1
+		) as currentTimeValue,
+		(
+			SELECT `value` FROM t_record WHERE
+			equipment_id = e.id and type = 2 and rec_status = 0
+			ORDER BY time DESC
+			limit 1
+		) as totalValue
+		FROM
+		t_equipment e
+		WHERE
+		(e.type = 4 or e.type = 3)
+		and e.rec_status = 0
+	</select>
+
+	<resultMap id="queryTransducer" type="com.ccsens.beneficiation.bean.vo.ParameterVo$Transducer">
+		<id column="title" property="title"/>
+		<collection property="values" ofType="com.ccsens.beneficiation.bean.vo.ParameterVo$TransducerValue">
+			<id column="id" property="id"/>
+			<result column="currentTimeValue" property="currentTimeValue"/>
+			<result column="setTimeValue" property="setTimeValue"/>
+		</collection>
+	</resultMap>
+	<select id="queryTransducer" resultMap="queryTransducer">
+		SELECT
+		e.id,
+		if(e.type = 2,'电磁阀','变频器') as title,
+		(
+			SELECT `value` FROM t_record WHERE
+			equipment_id = e.id and type = 0 and rec_status = 0
+			ORDER BY time DESC
+			limit 1
+		) as currentTimeValue,
+		(
+			SELECT `value` FROM t_record WHERE
+			equipment_id = e.id and type = 1 and rec_status = 0
+			ORDER BY time DESC
+			limit 1
+		) as setTimeValue
+		FROM
+		t_equipment e
+		WHERE
+		(e.type = 2 or e.type = 5)
+		and e.rec_status = 0
+	</select>
+	<resultMap id="queryParameter" type="com.ccsens.beneficiation.bean.vo.ParameterVo$Parameter">
+		<id column="title" property="title"/>
+		<collection property="values" ofType="com.ccsens.beneficiation.bean.vo.ParameterVo$ParameterThreshold">
+			<id column="id" property="id"/>
+			<result column="currentTimeValue" property="currentTimeValue"/>
+		</collection>
+	</resultMap>
+	<select id="queryParameter" resultMap="queryParameter">
+		SELECT
+		e.id,
+		'电耳' as title,
+		(
+			SELECT `value` FROM t_record WHERE
+			equipment_id = e.id and type = 0 and rec_status = 0
+			ORDER BY time DESC
+			limit 1
+		) as currentTimeValue
+		FROM
+		t_equipment e
+		WHERE
+		e.type = 1
+		and e.rec_status = 0
+	</select>
+	<select id="getThresholdValue" resultType="com.ccsens.beneficiation.bean.vo.ParameterVo$ThresholdValue">
+		SELECT
+		id,
+		CONCAT('thresholdValue',stages) as type,
+		CONCAT('阀值',stages) as `key`,
+		min as minValue,
+		max as `maxValue`
+		FROM
+		t_threshold_value
+		WHERE
+		equipment_id = #{equipmentId}
+		and stages = #{stages}
+		and rec_status = 0
+		ORDER BY created_at DESC
+		LIMIT 1
+	</select>
+</mapper>

beneficiation/src/main/resources/mapper_dao/WeightDao.xml

@@ -0,0 +1,72 @@
+<?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.ccsens.beneficiation.persist.dao.WeightDao">
+
+
+	<select id="queryWeightDay" resultType="com.ccsens.beneficiation.bean.vo.WeightVo$WeightDay">
+		SELECT
+		if(#{dateType} = 1,
+		CONCAT(DATE_FORMAT(time, '%Y'),'-',DATE_FORMAT(time, '%u')+1),
+		DATE_FORMAT(time, #{dateTypeStr})
+		)
+		as date,
+		sum(weight) as weight
+		FROM
+		t_weight
+		WHERE
+		equipment_id = #{equipmentId}
+		and rec_status = 0
+		<if test="startTime != null">
+			and time &gt;= startTime
+		</if>
+		<if test="endTime != null">
+			and time &lt;= endTime
+		</if>
+		GROUP BY DATE_FORMAT(time, #{dateTypeStr})
+	</select>
+	<select id="queryWeightTotal" resultType="com.ccsens.beneficiation.bean.vo.WeightVo$WeightTotal">
+		SELECT
+			SUM(CASE a.t WHEN 'day' THEN a.weight ELSE 0 END) as weightDay,
+			SUM(CASE a.t WHEN 'week' THEN a.weight ELSE 0 END) as weightWeek,
+			SUM(CASE a.t WHEN 'month' THEN a.weight ELSE 0 END) as weightMonth,
+			SUM(CASE a.t WHEN 'year' THEN a.weight ELSE 0 END) as weightYear
+			FROM
+			(
+				SELECT
+				sum(weight) as weight,
+				'day' as t
+				FROM
+				t_weight
+				WHERE
+				rec_status = 0
+				and DATE_FORMAT(time, '%Y-%m-%d') = DATE_FORMAT(#{datetime}, '%Y-%m-%d')
+		UNION ALL
+				SELECT
+				sum(weight) as weight,
+				'week' as t
+				FROM
+				t_weight
+				WHERE
+				rec_status = 0
+				and DATE_FORMAT(time, '%Y-%u') = DATE_FORMAT(#{datetime}, '%Y-%u')
+		UNION ALL
+				SELECT
+				sum(weight) as weight,
+				'month' as t
+				FROM
+				t_weight
+				WHERE
+				rec_status = 0
+				and DATE_FORMAT(time, '%Y-%m') = DATE_FORMAT(#{datetime}, '%Y-%m')
+		UNION ALL
+				SELECT
+				sum(weight) as weight,
+				'year' as t
+				FROM
+				t_weight
+				WHERE
+				rec_status = 0
+				and DATE_FORMAT(time, '%Y') = DATE_FORMAT(#{datetime}, '%Y')
+				) a
+	</select>
+</mapper>

beneficiation/src/main/resources/mapper_raw/AdjustRecordMapper.xml

@@ -0,0 +1,323 @@
+<?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.ccsens.beneficiation.persist.mapper.AdjustRecordMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.beneficiation.bean.po.AdjustRecord">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="time" jdbcType="BIGINT" property="time" />
+    <result column="monitoring_id" jdbcType="BIGINT" property="monitoringId" />
+    <result column="monitoring_value" jdbcType="VARCHAR" property="monitoringValue" />
+    <result column="threshold_id" jdbcType="BIGINT" property="thresholdId" />
+    <result column="equipment_id" jdbcType="BIGINT" property="equipmentId" />
+    <result column="before_value" jdbcType="VARCHAR" property="beforeValue" />
+    <result column="after_value" jdbcType="VARCHAR" property="afterValue" />
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, time, monitoring_id, monitoring_value, threshold_id, equipment_id, before_value, 
+    after_value, operator, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.beneficiation.bean.po.AdjustRecordExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_adjust_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_adjust_record
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_adjust_record
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.beneficiation.bean.po.AdjustRecordExample">
+    delete from t_adjust_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.beneficiation.bean.po.AdjustRecord">
+    insert into t_adjust_record (id, time, monitoring_id, 
+      monitoring_value, threshold_id, equipment_id, 
+      before_value, after_value, operator, 
+      created_at, updated_at, rec_status
+      )
+    values (#{id,jdbcType=BIGINT}, #{time,jdbcType=BIGINT}, #{monitoringId,jdbcType=BIGINT}, 
+      #{monitoringValue,jdbcType=VARCHAR}, #{thresholdId,jdbcType=BIGINT}, #{equipmentId,jdbcType=BIGINT}, 
+      #{beforeValue,jdbcType=VARCHAR}, #{afterValue,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.beneficiation.bean.po.AdjustRecord">
+    insert into t_adjust_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="time != null">
+        time,
+      </if>
+      <if test="monitoringId != null">
+        monitoring_id,
+      </if>
+      <if test="monitoringValue != null">
+        monitoring_value,
+      </if>
+      <if test="thresholdId != null">
+        threshold_id,
+      </if>
+      <if test="equipmentId != null">
+        equipment_id,
+      </if>
+      <if test="beforeValue != null">
+        before_value,
+      </if>
+      <if test="afterValue != null">
+        after_value,
+      </if>
+      <if test="operator != null">
+        operator,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="time != null">
+        #{time,jdbcType=BIGINT},
+      </if>
+      <if test="monitoringId != null">
+        #{monitoringId,jdbcType=BIGINT},
+      </if>
+      <if test="monitoringValue != null">
+        #{monitoringValue,jdbcType=VARCHAR},
+      </if>
+      <if test="thresholdId != null">
+        #{thresholdId,jdbcType=BIGINT},
+      </if>
+      <if test="equipmentId != null">
+        #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="beforeValue != null">
+        #{beforeValue,jdbcType=VARCHAR},
+      </if>
+      <if test="afterValue != null">
+        #{afterValue,jdbcType=VARCHAR},
+      </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.beneficiation.bean.po.AdjustRecordExample" resultType="java.lang.Long">
+    select count(*) from t_adjust_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_adjust_record
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.time != null">
+        time = #{record.time,jdbcType=BIGINT},
+      </if>
+      <if test="record.monitoringId != null">
+        monitoring_id = #{record.monitoringId,jdbcType=BIGINT},
+      </if>
+      <if test="record.monitoringValue != null">
+        monitoring_value = #{record.monitoringValue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.thresholdId != null">
+        threshold_id = #{record.thresholdId,jdbcType=BIGINT},
+      </if>
+      <if test="record.equipmentId != null">
+        equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.beforeValue != null">
+        before_value = #{record.beforeValue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.afterValue != null">
+        after_value = #{record.afterValue,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operator != null">
+        operator = #{record.operator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_adjust_record
+    set id = #{record.id,jdbcType=BIGINT},
+      time = #{record.time,jdbcType=BIGINT},
+      monitoring_id = #{record.monitoringId,jdbcType=BIGINT},
+      monitoring_value = #{record.monitoringValue,jdbcType=VARCHAR},
+      threshold_id = #{record.thresholdId,jdbcType=BIGINT},
+      equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      before_value = #{record.beforeValue,jdbcType=VARCHAR},
+      after_value = #{record.afterValue,jdbcType=VARCHAR},
+      operator = #{record.operator,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.beneficiation.bean.po.AdjustRecord">
+    update t_adjust_record
+    <set>
+      <if test="time != null">
+        time = #{time,jdbcType=BIGINT},
+      </if>
+      <if test="monitoringId != null">
+        monitoring_id = #{monitoringId,jdbcType=BIGINT},
+      </if>
+      <if test="monitoringValue != null">
+        monitoring_value = #{monitoringValue,jdbcType=VARCHAR},
+      </if>
+      <if test="thresholdId != null">
+        threshold_id = #{thresholdId,jdbcType=BIGINT},
+      </if>
+      <if test="equipmentId != null">
+        equipment_id = #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="beforeValue != null">
+        before_value = #{beforeValue,jdbcType=VARCHAR},
+      </if>
+      <if test="afterValue != null">
+        after_value = #{afterValue,jdbcType=VARCHAR},
+      </if>
+      <if test="operator != null">
+        operator = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.beneficiation.bean.po.AdjustRecord">
+    update t_adjust_record
+    set time = #{time,jdbcType=BIGINT},
+      monitoring_id = #{monitoringId,jdbcType=BIGINT},
+      monitoring_value = #{monitoringValue,jdbcType=VARCHAR},
+      threshold_id = #{thresholdId,jdbcType=BIGINT},
+      equipment_id = #{equipmentId,jdbcType=BIGINT},
+      before_value = #{beforeValue,jdbcType=VARCHAR},
+      after_value = #{afterValue,jdbcType=VARCHAR},
+      operator = #{operator,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

beneficiation/src/main/resources/mapper_raw/EquipmentMapper.xml

@@ -0,0 +1,258 @@
+<?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.ccsens.beneficiation.persist.mapper.EquipmentMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.beneficiation.bean.po.Equipment">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="auth_id" jdbcType="VARCHAR" property="authId" />
+    <result column="verion" jdbcType="VARCHAR" property="verion" />
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, type, auth_id, verion, operator, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.beneficiation.bean.po.EquipmentExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_equipment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_equipment
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_equipment
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.beneficiation.bean.po.EquipmentExample">
+    delete from t_equipment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.beneficiation.bean.po.Equipment">
+    insert into t_equipment (id, type, auth_id, 
+      verion, operator, created_at, 
+      updated_at, rec_status)
+    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{authId,jdbcType=VARCHAR}, 
+      #{verion,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.beneficiation.bean.po.Equipment">
+    insert into t_equipment
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="authId != null">
+        auth_id,
+      </if>
+      <if test="verion != null">
+        verion,
+      </if>
+      <if test="operator != null">
+        operator,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
+      <if test="authId != null">
+        #{authId,jdbcType=VARCHAR},
+      </if>
+      <if test="verion != null">
+        #{verion,jdbcType=VARCHAR},
+      </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.beneficiation.bean.po.EquipmentExample" resultType="java.lang.Long">
+    select count(*) from t_equipment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_equipment
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
+      <if test="record.authId != null">
+        auth_id = #{record.authId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.verion != null">
+        verion = #{record.verion,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operator != null">
+        operator = #{record.operator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_equipment
+    set id = #{record.id,jdbcType=BIGINT},
+      type = #{record.type,jdbcType=TINYINT},
+      auth_id = #{record.authId,jdbcType=VARCHAR},
+      verion = #{record.verion,jdbcType=VARCHAR},
+      operator = #{record.operator,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.beneficiation.bean.po.Equipment">
+    update t_equipment
+    <set>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
+      <if test="authId != null">
+        auth_id = #{authId,jdbcType=VARCHAR},
+      </if>
+      <if test="verion != null">
+        verion = #{verion,jdbcType=VARCHAR},
+      </if>
+      <if test="operator != null">
+        operator = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.beneficiation.bean.po.Equipment">
+    update t_equipment
+    set type = #{type,jdbcType=TINYINT},
+      auth_id = #{authId,jdbcType=VARCHAR},
+      verion = #{verion,jdbcType=VARCHAR},
+      operator = #{operator,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

beneficiation/src/main/resources/mapper_raw/EquipmentTypeMapper.xml

@@ -0,0 +1,258 @@
+<?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.ccsens.beneficiation.persist.mapper.EquipmentTypeMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.beneficiation.bean.po.EquipmentType">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="equipment_id" jdbcType="BIGINT" property="equipmentId" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+    <result column="addr" jdbcType="INTEGER" property="addr" />
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, equipment_id, type, addr, operator, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.beneficiation.bean.po.EquipmentTypeExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_equipment_type
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_equipment_type
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_equipment_type
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.beneficiation.bean.po.EquipmentTypeExample">
+    delete from t_equipment_type
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.beneficiation.bean.po.EquipmentType">
+    insert into t_equipment_type (id, equipment_id, type, 
+      addr, operator, created_at, 
+      updated_at, rec_status)
+    values (#{id,jdbcType=BIGINT}, #{equipmentId,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, 
+      #{addr,jdbcType=INTEGER}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.beneficiation.bean.po.EquipmentType">
+    insert into t_equipment_type
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="equipmentId != null">
+        equipment_id,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+      <if test="addr != null">
+        addr,
+      </if>
+      <if test="operator != null">
+        operator,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="equipmentId != null">
+        #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
+      <if test="addr != null">
+        #{addr,jdbcType=INTEGER},
+      </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.beneficiation.bean.po.EquipmentTypeExample" resultType="java.lang.Long">
+    select count(*) from t_equipment_type
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_equipment_type
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.equipmentId != null">
+        equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
+      <if test="record.addr != null">
+        addr = #{record.addr,jdbcType=INTEGER},
+      </if>
+      <if test="record.operator != null">
+        operator = #{record.operator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_equipment_type
+    set id = #{record.id,jdbcType=BIGINT},
+      equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      type = #{record.type,jdbcType=TINYINT},
+      addr = #{record.addr,jdbcType=INTEGER},
+      operator = #{record.operator,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.beneficiation.bean.po.EquipmentType">
+    update t_equipment_type
+    <set>
+      <if test="equipmentId != null">
+        equipment_id = #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
+      <if test="addr != null">
+        addr = #{addr,jdbcType=INTEGER},
+      </if>
+      <if test="operator != null">
+        operator = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.beneficiation.bean.po.EquipmentType">
+    update t_equipment_type
+    set equipment_id = #{equipmentId,jdbcType=BIGINT},
+      type = #{type,jdbcType=TINYINT},
+      addr = #{addr,jdbcType=INTEGER},
+      operator = #{operator,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

beneficiation/src/main/resources/mapper_raw/RecordMapper.xml

@@ -0,0 +1,275 @@
+<?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.ccsens.beneficiation.persist.mapper.RecordMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.beneficiation.bean.po.Record">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="equipment_id" jdbcType="BIGINT" property="equipmentId" />
+    <result column="value" jdbcType="INTEGER" property="value" />
+    <result column="time" jdbcType="TIMESTAMP" property="time" />
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="type" jdbcType="TINYINT" property="type" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, equipment_id, value, time, operator, created_at, updated_at, rec_status, type
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.beneficiation.bean.po.RecordExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_record
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_record
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.beneficiation.bean.po.RecordExample">
+    delete from t_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.beneficiation.bean.po.Record">
+    insert into t_record (id, equipment_id, value, 
+      time, operator, created_at, 
+      updated_at, rec_status, type
+      )
+    values (#{id,jdbcType=BIGINT}, #{equipmentId,jdbcType=BIGINT}, #{value,jdbcType=INTEGER}, 
+      #{time,jdbcType=TIMESTAMP}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{type,jdbcType=TINYINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.beneficiation.bean.po.Record">
+    insert into t_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="equipmentId != null">
+        equipment_id,
+      </if>
+      <if test="value != null">
+        value,
+      </if>
+      <if test="time != null">
+        time,
+      </if>
+      <if test="operator != null">
+        operator,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+      <if test="type != null">
+        type,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="equipmentId != null">
+        #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="value != null">
+        #{value,jdbcType=INTEGER},
+      </if>
+      <if test="time != null">
+        #{time,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="type != null">
+        #{type,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.beneficiation.bean.po.RecordExample" resultType="java.lang.Long">
+    select count(*) from t_record
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_record
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.equipmentId != null">
+        equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.value != null">
+        value = #{record.value,jdbcType=INTEGER},
+      </if>
+      <if test="record.time != null">
+        time = #{record.time,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.operator != null">
+        operator = #{record.operator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_record
+    set id = #{record.id,jdbcType=BIGINT},
+      equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      value = #{record.value,jdbcType=INTEGER},
+      time = #{record.time,jdbcType=TIMESTAMP},
+      operator = #{record.operator,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      type = #{record.type,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.beneficiation.bean.po.Record">
+    update t_record
+    <set>
+      <if test="equipmentId != null">
+        equipment_id = #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="value != null">
+        value = #{value,jdbcType=INTEGER},
+      </if>
+      <if test="time != null">
+        time = #{time,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operator != null">
+        operator = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="type != null">
+        type = #{type,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.beneficiation.bean.po.Record">
+    update t_record
+    set equipment_id = #{equipmentId,jdbcType=BIGINT},
+      value = #{value,jdbcType=INTEGER},
+      time = #{time,jdbcType=TIMESTAMP},
+      operator = #{operator,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      type = #{type,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

beneficiation/src/main/resources/mapper_raw/ThresholdValueMapper.xml

@@ -0,0 +1,275 @@
+<?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.ccsens.beneficiation.persist.mapper.ThresholdValueMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.beneficiation.bean.po.ThresholdValue">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="equipment_id" jdbcType="BIGINT" property="equipmentId" />
+    <result column="stages" jdbcType="TINYINT" property="stages" />
+    <result column="max" jdbcType="INTEGER" property="max" />
+    <result column="min" jdbcType="INTEGER" property="min" />
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, equipment_id, stages, max, min, operator, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.beneficiation.bean.po.ThresholdValueExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_threshold_value
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_threshold_value
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_threshold_value
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.beneficiation.bean.po.ThresholdValueExample">
+    delete from t_threshold_value
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.beneficiation.bean.po.ThresholdValue">
+    insert into t_threshold_value (id, equipment_id, stages, 
+      max, min, operator, 
+      created_at, updated_at, rec_status
+      )
+    values (#{id,jdbcType=BIGINT}, #{equipmentId,jdbcType=BIGINT}, #{stages,jdbcType=TINYINT}, 
+      #{max,jdbcType=INTEGER}, #{min,jdbcType=INTEGER}, #{operator,jdbcType=BIGINT}, 
+      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.beneficiation.bean.po.ThresholdValue">
+    insert into t_threshold_value
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="equipmentId != null">
+        equipment_id,
+      </if>
+      <if test="stages != null">
+        stages,
+      </if>
+      <if test="max != null">
+        max,
+      </if>
+      <if test="min != null">
+        min,
+      </if>
+      <if test="operator != null">
+        operator,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="equipmentId != null">
+        #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="stages != null">
+        #{stages,jdbcType=TINYINT},
+      </if>
+      <if test="max != null">
+        #{max,jdbcType=INTEGER},
+      </if>
+      <if test="min != null">
+        #{min,jdbcType=INTEGER},
+      </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.beneficiation.bean.po.ThresholdValueExample" resultType="java.lang.Long">
+    select count(*) from t_threshold_value
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_threshold_value
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.equipmentId != null">
+        equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.stages != null">
+        stages = #{record.stages,jdbcType=TINYINT},
+      </if>
+      <if test="record.max != null">
+        max = #{record.max,jdbcType=INTEGER},
+      </if>
+      <if test="record.min != null">
+        min = #{record.min,jdbcType=INTEGER},
+      </if>
+      <if test="record.operator != null">
+        operator = #{record.operator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_threshold_value
+    set id = #{record.id,jdbcType=BIGINT},
+      equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      stages = #{record.stages,jdbcType=TINYINT},
+      max = #{record.max,jdbcType=INTEGER},
+      min = #{record.min,jdbcType=INTEGER},
+      operator = #{record.operator,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.beneficiation.bean.po.ThresholdValue">
+    update t_threshold_value
+    <set>
+      <if test="equipmentId != null">
+        equipment_id = #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="stages != null">
+        stages = #{stages,jdbcType=TINYINT},
+      </if>
+      <if test="max != null">
+        max = #{max,jdbcType=INTEGER},
+      </if>
+      <if test="min != null">
+        min = #{min,jdbcType=INTEGER},
+      </if>
+      <if test="operator != null">
+        operator = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.beneficiation.bean.po.ThresholdValue">
+    update t_threshold_value
+    set equipment_id = #{equipmentId,jdbcType=BIGINT},
+      stages = #{stages,jdbcType=TINYINT},
+      max = #{max,jdbcType=INTEGER},
+      min = #{min,jdbcType=INTEGER},
+      operator = #{operator,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

beneficiation/src/main/resources/mapper_raw/WeightMapper.xml

@@ -0,0 +1,258 @@
+<?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.ccsens.beneficiation.persist.mapper.WeightMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.beneficiation.bean.po.Weight">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="equipment_id" jdbcType="BIGINT" property="equipmentId" />
+    <result column="weight" jdbcType="VARCHAR" property="weight" />
+    <result column="time" jdbcType="TIMESTAMP" property="time" />
+    <result column="operator" jdbcType="BIGINT" property="operator" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, equipment_id, weight, time, operator, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.beneficiation.bean.po.WeightExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_weight
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_weight
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_weight
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.beneficiation.bean.po.WeightExample">
+    delete from t_weight
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.beneficiation.bean.po.Weight">
+    insert into t_weight (id, equipment_id, weight, 
+      time, operator, created_at, 
+      updated_at, rec_status)
+    values (#{id,jdbcType=BIGINT}, #{equipmentId,jdbcType=BIGINT}, #{weight,jdbcType=VARCHAR}, 
+      #{time,jdbcType=TIMESTAMP}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.beneficiation.bean.po.Weight">
+    insert into t_weight
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="equipmentId != null">
+        equipment_id,
+      </if>
+      <if test="weight != null">
+        weight,
+      </if>
+      <if test="time != null">
+        time,
+      </if>
+      <if test="operator != null">
+        operator,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="equipmentId != null">
+        #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="weight != null">
+        #{weight,jdbcType=VARCHAR},
+      </if>
+      <if test="time != null">
+        #{time,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operator != null">
+        #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.beneficiation.bean.po.WeightExample" resultType="java.lang.Long">
+    select count(*) from t_weight
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_weight
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.equipmentId != null">
+        equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.weight != null">
+        weight = #{record.weight,jdbcType=VARCHAR},
+      </if>
+      <if test="record.time != null">
+        time = #{record.time,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.operator != null">
+        operator = #{record.operator,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_weight
+    set id = #{record.id,jdbcType=BIGINT},
+      equipment_id = #{record.equipmentId,jdbcType=BIGINT},
+      weight = #{record.weight,jdbcType=VARCHAR},
+      time = #{record.time,jdbcType=TIMESTAMP},
+      operator = #{record.operator,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.beneficiation.bean.po.Weight">
+    update t_weight
+    <set>
+      <if test="equipmentId != null">
+        equipment_id = #{equipmentId,jdbcType=BIGINT},
+      </if>
+      <if test="weight != null">
+        weight = #{weight,jdbcType=VARCHAR},
+      </if>
+      <if test="time != null">
+        time = #{time,jdbcType=TIMESTAMP},
+      </if>
+      <if test="operator != null">
+        operator = #{operator,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.beneficiation.bean.po.Weight">
+    update t_weight
+    set equipment_id = #{equipmentId,jdbcType=BIGINT},
+      weight = #{weight,jdbcType=VARCHAR},
+      time = #{time,jdbcType=TIMESTAMP},
+      operator = #{operator,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

beneficiation/src/main/resources/mybatis/mybatis-config.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+    <!-- 全局参数 -->
+    <settings>
+        <!-- 打印SQL语句 -->
+        <setting name="logImpl" value="STDOUT_LOGGING" />
+        <!-- 使全局的映射器启用或禁用缓存。 -->
+        <setting name="cacheEnabled" value="true"/>
+        <!-- 全局启用或禁用延迟加载。当禁用时，所有关联对象都会即时加载。 -->
+        <setting name="lazyLoadingEnabled" value="true"/>
+        <!-- 当启用时，有延迟加载属性的对象在被调用时将会完全加载任意属性。否则，每种属性将会按需要加载。 -->
+        <setting name="aggressiveLazyLoading" value="true"/>
+        <!-- 是否允许单条sql 返回多个数据集  (取决于驱动的兼容性) default:true -->
+        <setting name="multipleResultSetsEnabled" value="true"/>
+        <!-- 是否可以使用列的别名 (取决于驱动的兼容性) default:true -->
+        <setting name="useColumnLabel" value="true"/>
+        <!-- 允许JDBC 生成主键。需要驱动器支持。如果设为了true，这个设置将强制使用被生成的主键，有一些驱动器不兼容不过仍然可以执行。  default:false  -->
+        <setting name="useGeneratedKeys" value="true"/>
+        <!-- 指定 MyBatis 如何自动映射 数据基表的列 NONE：不隐射　PARTIAL:部分  FULL:全部  -->
+        <setting name="autoMappingBehavior" value="PARTIAL"/>
+        <!-- 这是默认的执行类型  （SIMPLE: 简单； REUSE: 执行器可能重复使用prepared statements语句；BATCH: 执行器可以重复执行语句和批量更新）  -->
+        <setting name="defaultExecutorType" value="SIMPLE"/>
+        <!-- 使用驼峰命名法转换字段。 -->
+        <setting name="mapUnderscoreToCamelCase" value="true"/>
+        <!-- 设置本地缓存范围 session:就会有数据的共享  statement:语句范围 (这样就不会有数据的共享 ) defalut:session -->
+        <setting name="localCacheScope" value="SESSION"/>
+        <!-- 设置但JDBC类型为空时,某些驱动程序 要指定值,default:OTHER，插入空值时不需要指定类型 -->
+        <setting name="jdbcTypeForNull" value="NULL"/>
+    </settings>
+
+    <typeAliases>
+        <typeAlias alias="Integer" type="java.lang.Integer" />
+        <typeAlias alias="Long" type="java.lang.Long" />
+        <typeAlias alias="HashMap" type="java.util.HashMap" />
+        <typeAlias alias="LinkedHashMap" type="java.util.LinkedHashMap" />
+        <typeAlias alias="ArrayList" type="java.util.ArrayList" />
+        <typeAlias alias="LinkedList" type="java.util.LinkedList" />
+        <typeAlias alias="String" type="java.lang.String" />
+    </typeAliases>
+
+    <plugins>
+        <!-- com.github.pagehelper为PageHelper类所在包名 -->
+        <plugin interceptor="com.github.pagehelper.PageHelper">
+            <property name="dialect" value="mysql"/>
+            <!-- 该参数默认为false -->
+            <!-- 设置为true时，会将RowBounds第一个参数offset当成pageNum页码使用 -->
+            <!-- 和startPage中的pageNum效果一样-->
+            <property name="offsetAsPageNum" value="false"/>
+            <!-- 该参数默认为false -->
+            <!-- 设置为true时，使用RowBounds分页会进行count查询 -->
+            <property name="rowBoundsWithCount" value="false"/>
+            <property name="pageSizeZero" value="true"/>
+            <property name="reasonable" value="false"/>
+            <property name="supportMethodsArguments" value="false"/>
+            <property name="returnPageInfo" value="none"/>
+        </plugin>
+    </plugins>
+</configuration>

cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java

@@ -1,6 +1,9 @@
 package com.ccsens.cloudutil.aspect;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.ccsens.cloudutil.bean.tall.dto.LogDto;
+import com.ccsens.cloudutil.bean.tall.vo.UserVo;
 import com.ccsens.cloudutil.feign.TallFeignClient;
 import com.ccsens.util.UploadFileUtil_Servlet3;
 import com.ccsens.util.WebConstant;
@@ -74,6 +77,13 @@ public class LogAspect {
             throw throwable;
         }
         if (logDto != null) {
+            if("/users/signin".equals(logDto.getUrl()) && result != null){
+                JSONObject json = JSONObject.parseObject(JSON.toJSONString(result));
+                if(json.getIntValue("code") == 200 && json.get("data") != null){
+                    long userId = json.getJSONObject("data").getLongValue("id");
+                    logDto.setUserId(userId);
+                }
+            }
             String message = result == null ? null : result.toString().length() > 1000 ? result.toString().substring(0, 1000) : result.toString();
             logDto.setResult(message);
             tallFeignClient.log(logDto);
@@ -98,9 +108,9 @@ public class LogAspect {
             log.info("保存日志，不进行记录");
             return null;
         }
-
         LogDto dto = new LogDto();
         dto.setUrl(url);
+        dto.setFacility(request.getHeader("fingerprint"));
         //参数
         Object[] args = pjp.getArgs();
         StringBuilder param = new StringBuilder();
@@ -114,6 +124,7 @@ public class LogAspect {
                 String userId = claims == null ? null : ((Claims) claims).getSubject();
                 if (userId != null) {
                     param.append("userId:").append(userId).append("--");
+                    dto.setUserId(Long.parseLong(userId));
                 }
 
             } else if (args[i] instanceof Part) {

cloudutil/src/main/java/com/ccsens/cloudutil/aspect/MustLoginAspect.java

@@ -48,7 +48,9 @@ public class MustLoginAspect {
                 RequestContextHolder.getRequestAttributes()).getRequest();
 
         final String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
-
+//        if(StrUtil.isEmpty(authHeader)){
+//            return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
+//        }
         Object[] args = pjp.getArgs();
         QueryDto dto = args == null || args.length < 1 ? null : (QueryDto) args[0];
 
@@ -69,8 +71,12 @@ public class MustLoginAspect {
             if (response != null && response.getCode().intValue() == CodeEnum.SUCCESS.getCode().intValue() && response.getData() != null) {
                 JSONObject json = JSONObject.parseObject(JSON.toJSONString(response.getData()));
                 Long userId = json.getLong("id");
+                String userName = json.getString("userName");
+                String avatarUrl =  json.getString("avatarUrl");
                 if (dto != null) {
                     dto.setUserId(userId);
+                    dto.setUserName(userName);
+                    dto.setAvatarUrl(avatarUrl);
                 }
             }
             Object result = pjp.proceed();
@@ -85,12 +91,16 @@ public class MustLoginAspect {
         }
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(response.getData()));
         Long userId = json.getLong("id");
+        String userName = json.getString("userName");
+        String avatarUrl =  json.getString("avatarUrl");
         if (userId == null || userId == 0) {
             return JsonResponse.newInstance().ok(CodeEnum.NOT_LOGIN);
         }
 
         if (dto != null) {
             dto.setUserId(userId);
+            dto.setUserName(userName);
+            dto.setAvatarUrl(avatarUrl);
         }
 
         Object result = pjp.proceed();

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/LogDto.java

@@ -24,4 +24,8 @@ public class LogDto {
     private String methodDesc;
     @ApiModelProperty("接口返回值(或异常)")
     private String result;
+    @ApiModelProperty("设备信息")
+    private String facility;
+    @ApiModelProperty("设备信息")
+    private Long userId;
 }

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/MemberRoleDto.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.beans.BeanUtils;
 
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -76,4 +77,71 @@ public class MemberRoleDto {
             return assign;
         }
     }
+
+    @Data
+    @ApiModel("添加成员")
+    public static class SaveMember{
+        @NotNull
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("成员名")
+        private String memberName;
+        @NotEmpty
+        @ApiModelProperty("成员手机号")
+        private String phone;
+        @ApiModelProperty("所属角色的id")
+        private List<Long> roleId;
+        @ApiModelProperty("奖惩干系人手机号")
+        private String stakeholderPhone;
+        @ApiModelProperty("奖惩干系人姓名")
+        private String stakeholderName;
+        @ApiModelProperty("token")
+        private String token;
+    }
+
+    @Data
+    @ApiModel("添加角色")
+    public static class SaveRole{
+        @NotNull(message = "项目不能为空")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @NotEmpty(message = "角色名不能为空")
+        @ApiModelProperty("角色名")
+        private String roleName;
+        @ApiModelProperty("token")
+        private String token;
+    }
+
+    @Data
+    @ApiModel
+    public static class GetMemberByPhone{
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("手机号")
+        private String phone;
+        @ApiModelProperty("token")
+        private String token;
+    }
+
+
+    @Data
+    @ApiModel("给角色添加成员")
+    public static class SaveMemberInRole{
+        @NotNull(message = "角色Id不能为空")
+        @ApiModelProperty("角色id")
+        private Long roleId;
+        @ApiModelProperty("成员Id")
+        private Long memberId;
+        @ApiModelProperty("token")
+        private String token;
+    }
+
+    @Data
+    @ApiModel("给角色添加成员")
+    public static class DeleteRole{
+        @ApiModelProperty("角色id")
+        private Long roleId;
+        @ApiModelProperty("token")
+        private String token;
+    }
 }

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/TallTaskDto.java

@@ -0,0 +1,137 @@
+package com.ccsens.cloudutil.bean.tall.dto;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.ccsens.util.exception.BaseException;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NonNull;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ApiModel
+public class TallTaskDto {
+
+    @ApiModel
+    @Data
+    public static class AddTask {
+        @ApiModelProperty("关联项目Id")
+        private Long projectId;
+        @ApiModelProperty("关联的任务id(detailId)")
+        private Long parentTaskId;
+        @ApiModelProperty("任务名称")
+        @NotEmpty(message = "任务名不能为空")
+        private String taskName;
+        @ApiModelProperty("任务描述")
+        private String description;
+        @ApiModelProperty("负责人id")
+        @NotNull(message = "请选择负责人")
+        private Long executorId;
+        @ApiModelProperty("开始时间")
+        private Long beginTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+        @ApiModelProperty("重复周期")
+        private String cycle;
+        @ApiModelProperty("交付物")
+        private String taskDeliver;
+        @ApiModelProperty("插件")
+        private List<Long> pluginList;
+        @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急  默认0")
+        private Byte priority;
+        @ApiModelProperty("任务提醒消息")
+        private TaskRemindByAdd taskRemind;
+        @ApiModelProperty("token")
+        private String token;
+    }
+
+    @Data
+    @ApiModel("添加时设置任务提醒")
+    public static class TaskRemindByAdd{
+        @ApiModelProperty("提醒时机 0不提醒 1开始前，2开始时，3开始后，4结束前，5结束时，6结束后，7自定义时间")
+        private Byte remindTiming;
+        @ApiModelProperty("时长 提醒时机是“开始时”或“结束时”可以为空")
+        private Long duration = 0L;
+        @ApiModelProperty("时间单位 0分钟 1小时 2天")
+        private Byte unit;
+
+        public Long getDuration(){
+            if(ObjectUtil.isNull(unit)) {
+                throw new BaseException("时间单位不能为空");
+            }
+            if(remindTiming == 7){
+                return duration;
+            }
+            switch (unit) {
+                case 0:
+                    return duration * 60 * 1000L;
+                case 1:
+                    return duration * 60 * 60 * 1000L;
+                case 2:
+                    return duration * 24 * 60 * 60 * 1000L;
+                default:
+                    return duration;
+            }
+        }
+    }
+
+    @Data
+    @ApiModel("修改任务详细信息")
+    public static class UpdateTaskInfo{
+        @ApiModelProperty("任务id")
+        private Long id;
+        @ApiModelProperty("任务名")
+        private String name;
+        @ApiModelProperty("任务详情")
+        private String description;
+        @ApiModelProperty("负责人")
+        private Long executorRole;
+        @ApiModelProperty("任务开始时间")
+        private Long beginTime;
+        @ApiModelProperty("任务结束时间")
+        private Long endTime;
+        @ApiModelProperty("重复频率")
+        private String cycle;
+        @ApiModelProperty("任务奖惩")
+        private Long money;
+        @ApiModelProperty("任务切换模式，0时间到立刻切换 1延迟delay_time切换 2手动切换")
+        private int delay;
+        @ApiModelProperty("延迟切换时间")
+        private Long delayTime;
+        @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急  默认0")
+        private Byte priority;
+        @ApiModelProperty("是否是里程碑 0否 1是")
+        private Byte milestone;
+        @ApiModelProperty("需要修改的插件Id")
+        private List<Long> plugins;
+        @ApiModelProperty("token")
+        private String token;
+    }
+
+    @Data
+    @ApiModel("修改插件配置")
+    public static class UpdatePluginConfig {
+        @NonNull
+        @ApiModelProperty("任务id")
+        private Long taskId;
+        @ApiModelProperty("任务插件id")
+        private Long taskPluginId;
+        @ApiModelProperty("页面接口路径")
+        private String webPath;
+        @ApiModelProperty("入参")
+        private String importParam;
+        @ApiModelProperty("放置位置 默认0 ，0任务名 1详情页 2任务下")
+        private Byte placeLocation;
+        @ApiModelProperty("程序位置 0:tall内部，1外部")
+        private Byte routineLocation;
+        @ApiModelProperty("token")
+        private String token;
+
+        public UpdatePluginConfig() {
+        }
+    }
+
+}

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/dto/WpsDto.java

@@ -24,6 +24,8 @@ public class WpsDto {
         private String fileName;
         @ApiModelProperty("文件路径，默认在WebConstant.UPLOAD_PATH_BASE下")
         private String filePath;
+        @ApiModelProperty("文件实际存储路径")
+        private String realFilePath;
         @ApiModelProperty("文件大小")
         private Long fileSize;
         @ApiModelProperty("操作类型 值：WebConstant Wps USER_OPERATION... ")

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/MemberVo.java

@@ -1,5 +1,7 @@
 package com.ccsens.cloudutil.bean.tall.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -18,4 +20,38 @@ public class MemberVo {
         private Long joinTime;
         private Long stakeholderId;
     }
+
+    @Data
+    @ApiModel("角色信息")
+    public static class RoleInfo{
+        @ApiModelProperty("角色id")
+        private Long roleId;
+        @ApiModelProperty("角色名")
+        private String roleName;
+    }
+
+    @Data
+    @ApiModel("添加时返回成员信息")
+    public static class Member{
+        @ApiModelProperty("成员id")
+        private Long memberId;
+        @ApiModelProperty("成员名")
+        private String memberName;
+        @ApiModelProperty("手机号")
+        private String phone;
+        @ApiModelProperty("userId")
+        private Long userId;
+    }
+
+
+    @Data
+    @ApiModel("查找项目内所有的成员")
+    public static class MemberList{
+        @ApiModelProperty("成员id")
+        private Long memberId;
+        @ApiModelProperty("成员名")
+        private String memberName;
+        @ApiModelProperty("userId")
+        private Long userId;
+    }
 }

cloudutil/src/main/java/com/ccsens/cloudutil/bean/tall/vo/TaskVo.java

@@ -1,7 +1,14 @@
 package com.ccsens.cloudutil.bean.tall.vo;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 @Data
 public class TaskVo {
     @Data
@@ -11,4 +18,107 @@ public class TaskVo {
         private Long projectId;
         private String projectName;
     }
+
+    @ApiModel
+    @Data
+    public static class NormalTask{
+        @ApiModelProperty("任务详细信息id")
+        private Long detailId;
+        @ApiModelProperty("当前任务的时间段id")
+        private Long id;
+        @ApiModelProperty("名称")
+        private String name;
+        @ApiModelProperty("详细描述")
+        private String description;
+        @ApiModelProperty("父任务名称")
+        private String parentName;
+        @ApiModelProperty("所属项目id")
+        private Long projectId;
+        @ApiModelProperty("所属项目名称")
+        private String projectName;
+        @ApiModelProperty("负责人Id")
+        private Long executorRole;
+        @ApiModelProperty("负责人名称")
+        private String executorRoleName;
+        @ApiModelProperty("开始时间")
+        private Long beginTime;
+        @ApiModelProperty("结束时间")
+        private Long endTime;
+        @ApiModelProperty("时长")
+        private Long duration;
+        @ApiModelProperty("循环周期")
+        private String cycle;
+        @ApiModelProperty("跳转模式 0自动，1延迟,2手动")
+        private int delay;
+        @ApiModelProperty("实际开始时间")
+        private Long realBeginTime;
+        @ApiModelProperty("实际结束时间")
+        private Long realEndTime;
+        @ApiModelProperty("跳转结束时间")
+        private Long loopEndTime;
+        @ApiModelProperty("跳转的任务id")
+        private Long loopTo;
+        @ApiModelProperty("执行时间")
+        private Long execTimes;
+        @ApiModelProperty("奖惩")
+        private BigDecimal money;
+        @ApiModelProperty("状态：0-未开始，1-进行中，2-已完成")
+        private int process;
+        @ApiModelProperty("子项目id")
+        private Long subProjectId;
+        @ApiModelProperty("子项目名字")
+        private String subProjectName;
+        @ApiModelProperty("服务器时间")
+        private Long serverTime;
+        @ApiModelProperty("任务类型 0普通任务 1虚拟任务")
+        private int virtual;
+        @ApiModelProperty("有无分组")
+        private int hasGroup;
+        @ApiModelProperty("分数")
+        private BigDecimal score;
+        @ApiModelProperty("插件")
+        private List<PluginVo> plugins;
+        @ApiModelProperty("二级任务")
+        private List<NormalTask> secondTasks;
+        @ApiModelProperty("时间状态 0：正常  1：任务开始  2：任务结束")
+        private Byte timeStatus = 0;
+        @ApiModelProperty("当前周期内任务的序号")
+        private int sequence;
+        @ApiModelProperty("页面/接口路径")
+        private String webPath;
+        @ApiModelProperty("程序位置 0:tall内部，1外部")
+        private Byte routineLocation;
+        @ApiModelProperty("入参")
+        private String importParam;
+        public Long getDuration(){
+            if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) {
+                return endTime - beginTime;
+            }
+            return null;
+        }
+
+        public Long getServerTime(){
+            return System.currentTimeMillis();
+        }
+
+    }
+
+    @ApiModel
+    @Data
+    public static class PluginVo{
+        @ApiModelProperty("插件id")
+        private String id;
+        @ApiModelProperty("插件名")
+        private String name;
+        @ApiModelProperty("插件描述")
+        private String description;
+        @ApiModelProperty("显示分类")
+        private String showType;
+        @ApiModelProperty("页面/接口路径")
+        private String webPath;
+        @ApiModelProperty("程序位置 0:tall内部，1外部")
+        private Byte routineLocation;
+        @ApiModelProperty("入参")
+        private String importParam;
+    }
 }

cloudutil/src/main/java/com/ccsens/cloudutil/config/FeignTokenConfig.java

@@ -0,0 +1,27 @@
+package com.ccsens.cloudutil.config;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * @author 逗
+ */
+@Component
+public class FeignTokenConfig implements RequestInterceptor {
+    @Override
+    public void apply(RequestTemplate template) {
+        byte[] body = template.body();
+        if (body == null) {
+            return;
+        }
+        String json = new String(body);
+        JSONObject jsonObject = JSONUtil.parseObj(json);
+
+        //添加token
+        template.header("Authorization", jsonObject.getStr("token"));
+    }
+}

cloudutil/src/main/java/com/ccsens/cloudutil/feign/TallFeignClient.java

@@ -1,21 +1,17 @@
 package com.ccsens.cloudutil.feign;
 
 import com.ccsens.cloudutil.bean.QueryParam;
-import com.ccsens.cloudutil.bean.tall.dto.LogDto;
-import com.ccsens.cloudutil.bean.tall.dto.MemberRoleDto;
-import com.ccsens.cloudutil.bean.tall.dto.UserDto;
-import com.ccsens.cloudutil.bean.tall.dto.WpsDto;
+import com.ccsens.cloudutil.bean.tall.dto.*;
 import com.ccsens.cloudutil.bean.tall.vo.*;
+import com.ccsens.cloudutil.config.FeignTokenConfig;
 import com.ccsens.util.JsonResponse;
+import feign.RequestInterceptor;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -25,7 +21,7 @@ import java.util.List;
  * @create: 2019/11/27 10:03
  */
 
-@FeignClient(name = "tall", path = "v1.0", fallbackFactory = TallFeignClientFallBack.class)
+@FeignClient(name = "tall", path = "v1.0",fallbackFactory = TallFeignClientFallBack.class,configuration = FeignTokenConfig.class)
 public interface TallFeignClient {
 
     /**
@@ -160,7 +156,7 @@ public interface TallFeignClient {
     JsonResponse saveWpsFile(WpsDto.Business business);
 
     /**
-     * 保存WPS业务和文件记录
+     * 查询WPS业务和文件记录
      */
     @RequestMapping("/wps/visitUrls")
     List<String> queryVisitUrls(WpsDto.VisitWpsUrl visitWpsUrl);
@@ -177,12 +173,71 @@ public interface TallFeignClient {
     @GetMapping("/v1/3rd/getFilePath")
     String getWpsFilePath(@RequestParam(name = "businessId") Long businessId,@RequestParam(name = "businessType") byte businessType);
 
-    /**
+       /**
      * 通过userId呵taskId查找用户信息
      */
     @GetMapping("/users/memberByTask")
     JsonResponse<MemberVo.MemberInfo> getMemberInfoByUserIdAndTaskId(@RequestParam(name = "userId") Long userId,@RequestParam(name = "taskId") Long taskId);
 
+
+    /**
+     * 添加任务
+     */
+    @RequestMapping("/tasks")
+    JsonResponse<TaskVo.NormalTask> saveTask(TallTaskDto.AddTask addTask);
+
+    /**
+     * 修改任务
+     */
+    @RequestMapping("/tasks/change")
+    JsonResponse<TaskVo.NormalTask> updataTask(TallTaskDto.UpdateTaskInfo updateTaskInfo);
+    /**
+     * 删除任务
+     */
+    @DeleteMapping("/tasks")
+    JsonResponse deleteTask(@RequestParam(name = "taskId") Long taskId);
+
+    /**
+     * 修改任务插件配置
+     */
+    @RequestMapping("/plugins/config")
+    JsonResponse<TaskVo.PluginVo> updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig);
+
+    /**
+     * 添加角色
+     */
+    @RequestMapping("/roles/save")
+    JsonResponse<MemberVo.RoleInfo> saveRole(MemberRoleDto.SaveRole saveRole);
+
+    /**
+     * 添加成员
+     */
+    @RequestMapping("/members/save")
+    JsonResponse<MemberVo.Member> saveMember(MemberRoleDto.SaveMember saveMember);
+
+    /**
+     * 将成员添加至角色内
+     */
+    @RequestMapping("/roles/saveMember")
+    JsonResponse saveMemberInRole(MemberRoleDto.SaveMemberInRole saveMember);
+    /**
+     * 将成员从角色内删除
+     */
+    @RequestMapping("/roles/deleteMember")
+    JsonResponse deleteMemberInRole(MemberRoleDto.SaveMemberInRole saveMember);
+
+
+    /**
+     * 通过手机号和项目id查询成员信息
+     */
+    @RequestMapping("/members/query/memberByPhone")
+    JsonResponse<MemberVo.MemberList> queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone);
+
+    /**
+     * 删除角色
+     */
+    @RequestMapping("/roles/delete")
+    JsonResponse deleteRole(MemberRoleDto.DeleteRole deleteRole);
 }
 
 @Slf4j
@@ -295,6 +350,56 @@ class TallFeignClientFallBack implements FallbackFactory<TallFeignClient> {
             public JsonResponse<MemberVo.MemberInfo> getMemberInfoByUserIdAndTaskId(Long userId, Long taskId) {
                 return JsonResponse.newInstance().fail();
             }
+
+            @Override
+            public JsonResponse<TaskVo.NormalTask> saveTask(TallTaskDto.AddTask addTask) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse<TaskVo.NormalTask> updataTask(TallTaskDto.UpdateTaskInfo updateTaskInfo) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse deleteTask(Long taskId) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse<TaskVo.PluginVo> updatePluginConfig(TallTaskDto.UpdatePluginConfig updatePluginConfig) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse<MemberVo.RoleInfo> saveRole(MemberRoleDto.SaveRole saveRole) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse<MemberVo.Member> saveMember(MemberRoleDto.SaveMember saveMember) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse saveMemberInRole(MemberRoleDto.SaveMemberInRole saveMember) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse deleteMemberInRole(MemberRoleDto.SaveMemberInRole saveMember) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse<MemberVo.MemberList> queryMemberByPhone(MemberRoleDto.GetMemberByPhone getMemberByPhone) {
+                return JsonResponse.newInstance().fail();
+            }
+
+            @Override
+            public JsonResponse deleteRole(MemberRoleDto.DeleteRole deleteRole) {
+                return JsonResponse.newInstance().fail();
+            }
         };
     }
 

cloudutil/src/main/java/com/ccsens/cloudutil/ribbon/RibbonClientConfig.java

@@ -1,6 +1,7 @@
 package com.ccsens.cloudutil.ribbon;
 
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.netflix.ribbon.RibbonClients;
 import org.springframework.context.annotation.Configuration;
 
 /**

cloudutil/src/main/java/com/ccsens/cloudutil/ribbon/RibbonConfiguration.java

@@ -3,6 +3,8 @@ package com.ccsens.cloudutil.ribbon;
 import com.netflix.loadbalancer.IRule;
 import com.netflix.loadbalancer.RoundRobinRule;
 import com.netflix.loadbalancer.WeightedResponseTimeRule;
+import org.springframework.cloud.netflix.ribbon.RibbonClient;
+import org.springframework.cloud.netflix.ribbon.RibbonClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

cloudutil/src/main/java/com/ccsens/cloudutil/ribbon/WpsBalanceRule.java

@@ -0,0 +1,28 @@
+//package com.ccsens.cloudutil.ribbon;
+//
+//import com.netflix.client.config.IClientConfig;
+//import com.netflix.loadbalancer.AbstractLoadBalancerRule;
+//import com.netflix.loadbalancer.ILoadBalancer;
+//import com.netflix.loadbalancer.Server;
+//import org.springframework.context.annotation.Primary;
+//
+////@Primary
+//public class WpsBalanceRule extends AbstractLoadBalancerRule {
+//
+//    @Override
+//    public void initWithNiwsConfig(IClientConfig clientConfig) {
+//
+//    }
+//
+//    @Override
+//    public Server choose(Object key) {
+//        return choose(getLoadBalancer(), key);
+//    }
+//
+//    private Server choose(ILoadBalancer loadBalancer, Object key) {
+//        System.out.println(key);
+//        return null;
+//    }
+//
+//
+//}

cloudutil/src/main/resources/application-util-green.yml

@@ -0,0 +1,124 @@
+#<<<<<<< HEAD
+##服务端点暴露
+#management:
+#  endpoints:
+#    web:
+#      exposure:
+#        # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*'
+#        include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream
+##        # 不暴露哪些端点
+##        exclude: env,beans,configprops
+#  endpoint:
+#    health:
+#      # 是否展示健康检查详情
+#      show-details: always
+#  health:
+#    redis:
+#      enabled: false
+##eureka注册
+#eureka:
+#  client:
+#    service-url:
+#      # 指定eureka server通信地址，注意/eureka/小尾巴不能少
+#      #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
+##      defaultZone: http://admin:admin@49.233.89.188:7010/eureka/
+#      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
+#  instance:
+#    # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
+#    prefer-ip-address: true
+#    metadata-map:
+#      management:
+#        context-path: ${server.servlet.context-path:}/actuator
+#    home-page-url-path: ${server.servlet.context-path:}/
+#    status-page-url-path: ${server.servlet.context-path:}/actuator/info
+#    health-check-url-path: ${server.servlet.context-path:}/actuator/health
+#feign:
+#  client:
+#    config:
+#      default:
+#        connectTime: 5000
+#        readTimeout: 5000
+#        #  NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。
+#        #  BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。
+#        #  HEADERS：记录BASIC级别的基础上，记录请求和响应的header。
+#        #  FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据
+#        loggerLevel: basic
+#  hystrix:
+#    enabled: true
+## sleuth
+#logging:
+#  level:
+#    root: info
+#    org.springframework.cloud.sleuth: DEBUG
+#spring:
+##  zipkin:
+##    base-url: http://49.233.89.188:9411
+##  sleuth:
+##    sampler:
+##      # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。
+##      probability: 1.0
+#  cloud:
+#    inetutils:
+#=======
+#服务端点暴露
+management:
+  endpoints:
+    web:
+      exposure:
+        # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*'
+        include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream
+#        # 不暴露哪些端点
+#        exclude: env,beans,configprops
+  endpoint:
+    health:
+      # 是否展示健康检查详情
+      show-details: always
+  health:
+    redis:
+      enabled: false
+#eureka注册
+eureka:
+  client:
+    service-url:
+      # 指定eureka server通信地址，注意/eureka/小尾巴不能少
+      #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
+      defaultZone: http://admin:admin@49.232.6.143:7010/eureka/
+#      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
+#      defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
+  instance:
+    # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
+    prefer-ip-address: true
+    metadata-map:
+      management:
+        context-path: ${server.servlet.context-path:}/actuator
+    home-page-url-path: ${server.servlet.context-path:}/
+    status-page-url-path: ${server.servlet.context-path:}/actuator/info
+    health-check-url-path: ${server.servlet.context-path:}/actuator/health
+feign:
+  client:
+    config:
+      default:
+        connectTime: 5000
+        readTimeout: 5000
+        #  NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。
+        #  BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。
+        #  HEADERS：记录BASIC级别的基础上，记录请求和响应的header。
+        #  FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据
+        loggerLevel: basic
+  hystrix:
+    enabled: true
+# sleuth
+logging:
+  level:
+    root: info
+    org.springframework.cloud.sleuth: DEBUG
+spring:
+#  zipkin:
+#    base-url: http://49.233.89.188:9411
+#  sleuth:
+#    sampler:
+#      # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。
+#      probability: 1.0
+  cloud:
+    inetutils:
+      ignored-interfaces: ['VMware.*']

cloudutil/src/main/resources/application-util-greenvalley.yml

@@ -0,0 +1,54 @@
+#服务端点暴露
+management:
+  endpoints:
+    web:
+      exposure:
+        # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*'
+        include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream
+#        # 不暴露哪些端点
+#        exclude: env,beans,configprops
+  endpoint:
+    health:
+      # 是否展示健康检查详情
+      show-details: always
+  health:
+    redis:
+      enabled: false
+#eureka注册
+eureka:
+  client:
+    service-url:
+      # 指定eureka server通信地址，注意/eureka/小尾巴不能少
+#      defaultZone: http://admin:admin@82.156.116.247:7010/eureka/
+      defaultZone: http://admin:admin@49.232.6.143:7010/eureka/
+  instance:
+    # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
+    prefer-ip-address: true
+    metadata-map:
+      management:
+        context-path: ${server.servlet.context-path:}/actuator
+    home-page-url-path: ${server.servlet.context-path:}/
+    status-page-url-path: ${server.servlet.context-path:}/actuator/info
+    health-check-url-path: ${server.servlet.context-path:}/actuator/health
+feign:
+  client:
+    config:
+      default:
+        connectTime: 5000
+        readTimeout: 5000
+        #  NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。
+        #  BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。
+        #  HEADERS：记录BASIC级别的基础上，记录请求和响应的header。
+        #  FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据
+        loggerLevel: basic
+  hystrix:
+    enabled: true
+# sleuth
+logging:
+  level:
+    root: info
+    org.springframework.cloud.sleuth: DEBUG
+spring:
+  cloud:
+    inetutils:
+      ignored-interfaces: ['VMware.*']

cloudutil/src/main/resources/application-util-prod.yml

@@ -22,7 +22,7 @@ eureka:
       #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
 
 #      defaultZone: http://admin:admin@81.70.54.64:7010/eureka/
-      defaultZone: http://admin:admin@192.144.182.42:7010/eureka/
+      defaultZone: http://admin:admin@121.36.3.207:7010/eureka/
 
   instance:
     # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server

cloudutil/src/main/resources/application-util-prodsd.yml

@@ -0,0 +1,69 @@
+#服务端点暴露
+management:
+  endpoints:
+    web:
+      exposure:
+        # 暴露xxx端点，如需暴露多个，用,分隔；如需暴露所有端点，用'*'
+        include: auditevents,caches,conditions,flyway,health,heapdump,httptrace,info,integrationgraph,jolokia,logfile,loggers,liquibase,metrics,mappings,prometheus,scheduledtasks,sessions,shutdown,threaddump,hystrix.stream
+#        # 不暴露哪些端点
+        exclude: env,beans,configprops
+  endpoint:
+    health:
+      # 是否展示健康检查详情
+      show-details: always
+  health:
+    redis:
+      enabled: false
+#eureka注册
+eureka:
+  client:
+    service-url:
+      # 指定eureka server通信地址，注意/eureka/小尾巴不能少
+      #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
+
+#      defaultZone: http://admin:admin@81.70.54.64:7010/eureka/
+      defaultZone: http://admin:admin@121.36.3.207:7010/eureka/
+
+  instance:
+    # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server
+    prefer-ip-address: true
+    metadata-map:
+      management:
+        context-path: ${server.servlet.context-path:}/actuator
+    home-page-url-path: ${server.servlet.context-path:}/
+    status-page-url-path: ${server.servlet.context-path:}/actuator/info
+    health-check-url-path: ${server.servlet.context-path:}/actuator/health
+feign:
+  client:
+    config:
+      default:
+        connectTime: 5000
+        readTimeout: 5000
+        #  NONE【性能最佳，适用于生产】：不记录任何日志（默认值）。
+        #  BASIC【适用于生产环境追踪问题】：仅记录请求方法、URL、响应状态代码以及执行时间。
+        #  HEADERS：记录BASIC级别的基础上，记录请求和响应的header。
+        #  FULL【比较适用于开发及测试环境定位问题】：记录请求和响应的header、body和元数据
+        loggerLevel: basic
+  hystrix:
+    enabled: true
+hystrix:
+  threadpool:
+    default:
+      coreSize: 200 #并发执行的最大线程数，默认10
+      maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1
+      queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5
+# sleuth
+logging:
+  level:
+    root: info
+    org.springframework.cloud.sleuth: DEBUG
+spring:
+#  zipkin:
+#    base-url: http://140.143.228.3:9411
+#  sleuth:
+#    sampler:
+#      # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。
+#      probability: 0.1
+  cloud:
+    inetutils:
+      ignored-interfaces: ['VMware.*']

cloudutil/src/main/resources/application-util-test.yml

@@ -82,7 +82,11 @@ eureka:
     service-url:
       # 指定eureka server通信地址，注意/eureka/小尾巴不能少
       #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
-      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
+#      defaultZone: http://admin:admin@49.232.6.143:7010/eureka/
+#      defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
+
+      defaultZone: http://admin:admin@192.168.4.113:7010/eureka/
+#      defaultZone: http://admin:admin@192.168.31.13:7010/eureka/
 #      defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
   instance:
     # 是否注册IP到eureka server，如不指定或设为false，那就回注册主机名到eureka server

form/.gitignore

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

form/mvnw

@@ -0,0 +1,322 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ]; then
+
+  if [ -f /etc/mavenrc ]; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ]; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+darwin=false
+mingw=false
+case "$(uname)" in
+CYGWIN*) cygwin=true ;;
+MINGW*) mingw=true ;;
+Darwin*)
+  darwin=true
+  # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+  # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+  if [ -z "$JAVA_HOME" ]; then
+    if [ -x "/usr/libexec/java_home" ]; then
+      export JAVA_HOME="$(/usr/libexec/java_home)"
+    else
+      export JAVA_HOME="/Library/Java/Home"
+    fi
+  fi
+  ;;
+esac
+
+if [ -z "$JAVA_HOME" ]; then
+  if [ -r /etc/gentoo-release ]; then
+    JAVA_HOME=$(java-config --jre-home)
+  fi
+fi
+
+if [ -z "$M2_HOME" ]; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ]; do
+    ls=$(ls -ld "$PRG")
+    link=$(expr "$ls" : '.*-> \(.*\)$')
+    if expr "$link" : '/.*' >/dev/null; then
+      PRG="$link"
+    else
+      PRG="$(dirname "$PRG")/$link"
+    fi
+  done
+
+  saveddir=$(pwd)
+
+  M2_HOME=$(dirname "$PRG")/..
+
+  # make it fully qualified
+  M2_HOME=$(cd "$M2_HOME" && pwd)
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=$(cygpath --unix "$M2_HOME")
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="$( (
+      cd "$M2_HOME"
+      pwd
+    ))"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="$( (
+      cd "$JAVA_HOME"
+      pwd
+    ))"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=$(which readlink)
+    if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then
+      if $darwin; then
+        javaHome="$(dirname \"$javaExecutable\")"
+        javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac"
+      else
+        javaExecutable="$(readlink -f \"$javaExecutable\")"
+      fi
+      javaHome="$(dirname \"$javaExecutable\")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ]; then
+  if [ -n "$JAVA_HOME" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="$(which java)"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ]; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]; then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ]; do
+    if [ -d "$wdir"/.mvn ]; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=$(
+        cd "$wdir/.."
+        pwd
+      )
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' <"$1")"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(pwd)")
+if [ -z "$BASE_DIR" ]; then
+  exit 1
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+  if [ "$MVNW_VERBOSE" = true ]; then
+    echo "Found .mvn/wrapper/maven-wrapper.jar"
+  fi
+else
+  if [ "$MVNW_VERBOSE" = true ]; then
+    echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+  fi
+  if [ -n "$MVNW_REPOURL" ]; then
+    jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+  else
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+  fi
+  while IFS="=" read key value; do
+    case "$key" in wrapperUrl)
+      jarUrl="$value"
+      break
+      ;;
+    esac
+  done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+  if [ "$MVNW_VERBOSE" = true ]; then
+    echo "Downloading from: $jarUrl"
+  fi
+  wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+  if $cygwin; then
+    wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+  fi
+
+  if command -v wget >/dev/null; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found wget ... using wget"
+    fi
+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+      wget "$jarUrl" -O "$wrapperJarPath"
+    else
+      wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+    fi
+  elif command -v curl >/dev/null; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found curl ... using curl"
+    fi
+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+      curl -o "$wrapperJarPath" "$jarUrl" -f
+    else
+      curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+    fi
+
+  else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Falling back to using Java to download"
+    fi
+    javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+    # For Cygwin, switch paths to Windows format before running javac
+    if $cygwin; then
+      javaClass=$(cygpath --path --windows "$javaClass")
+    fi
+    if [ -e "$javaClass" ]; then
+      if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo " - Compiling MavenWrapperDownloader.java ..."
+        fi
+        # Compiling the Java class
+        ("$JAVA_HOME/bin/javac" "$javaClass")
+      fi
+      if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+        # Running the downloader
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo " - Running MavenWrapperDownloader.java ..."
+        fi
+        ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+      fi
+    fi
+  fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=$(cygpath --path --windows "$M2_HOME")
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

form/mvnw.cmd

@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

form/pom.xml

@@ -0,0 +1,72 @@
+<?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">
+    <parent>
+        <artifactId>ccsenscloud</artifactId>
+        <groupId>com.ccsens</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>form</artifactId>
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <!--cloud 工具类-->
+        <dependency>
+            <artifactId>cloudutil</artifactId>
+            <groupId>com.ccsens</groupId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <!--util 工具类-->
+
+        <dependency>
+            <groupId>com.ccsens</groupId>
+            <artifactId>util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mybatis.generator</groupId>
+                <artifactId>mybatis-generator-maven-plugin</artifactId>
+                <version>1.3.7</version>
+                <configuration>
+                    <configurationFile>${basedir}/src/main/resources/mbg.xml</configurationFile>
+                    <overwrite>true</overwrite>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>mysql</groupId>
+                        <artifactId>mysql-connector-java</artifactId>
+                        <version>5.1.34</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.ccsens.form.FormApplication</mainClass>
+                    <!--<skip>true</skip>-->
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+
+</project>

form/src/main/java/com/ccsens/form/FormApplication.java

@@ -0,0 +1,24 @@
+package com.ccsens.form;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+@MapperScan(basePackages = {"com.ccsens.form.persist.*"})
+@ServletComponentScan
+@EnableAsync
+//开启断路器功能
+@EnableCircuitBreaker
+@EnableFeignClients(basePackages = "com.ccsens.cloudutil.feign")
+@SpringBootApplication(scanBasePackages = "com.ccsens")
+public class FormApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(FormApplication.class, args);
+    }
+
+}

form/src/main/java/com/ccsens/form/api/DebugController.java

@@ -0,0 +1,28 @@
+package com.ccsens.form.api;
+
+import com.ccsens.util.JsonResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Api(tags = "DEBUG" , description = "DebugController | ")
+@RestController
+@RequestMapping("/debug")
+@Slf4j
+public class DebugController {
+    @ApiOperation(value = "/测试",notes = "")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+    public JsonResponse debug(HttpServletRequest request) throws Exception {
+
+        return JsonResponse.newInstance().ok("测试");
+    }
+
+}

form/src/main/java/com/ccsens/form/api/FileController.java

@@ -0,0 +1,105 @@
+package com.ccsens.form.api;
+
+import cn.hutool.core.lang.Snowflake;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.ccsens.cloudutil.feign.TallFeignClient;
+import com.ccsens.form.bean.po.CommonFile;
+import com.ccsens.form.bean.vo.FileVo;
+import com.ccsens.form.service.IFileService;
+import com.ccsens.form.util.Constant;
+import com.ccsens.util.*;
+import com.ccsens.util.exception.BaseException;
+import io.swagger.annotations.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: whj
+ * @time: 2020/7/17 11:36
+ */
+@Slf4j
+@Api(tags = "文件")
+@RestController
+@RequestMapping("/file")
+public class FileController {
+
+    @Resource
+    private IFileService fileService;
+    @Resource
+    private TallFeignClient tallFeignClient;
+    @Resource
+    private Snowflake snowflake;
+
+    
+    @ApiOperation(value = "上传文件")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "upload", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<FileVo.Upload> upload(HttpServletRequest request, @RequestParam() List<Part> files) throws Exception {
+        log.info("文件上传:{}", files);
+
+        String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
+        JsonResponse tokenRes = tallFeignClient.getUserIdByToken(authHeader);
+        log.info("{}查询userId返回：{}", authHeader, tokenRes);
+        if (tokenRes.getCode().intValue() != CodeEnum.SUCCESS.getCode().intValue()) {
+            return tokenRes;
+        }
+        JSONObject json = JSON.parseObject(JSON.toJSONString(tokenRes.getData()));
+        Long userId = json.getLong("id");
+        String dir = PropUtil.path + Constant.File.UPLOAD_URL;
+        List<CommonFile> fileVos = fileService.saveFile(dir, files, userId);
+        List<FileVo.Upload> vos = FileVo.Upload.transFilePo(fileVos);
+        log.info("文件上传返回：{}", vos);
+        return JsonResponse.newInstance().ok(vos);
+    }
+
+    @ApiOperation(value = "文件下载")
+    @GetMapping(value = "download/{id}")
+    public void download(HttpServletResponse response,  @PathVariable("id")Long id) throws Exception {
+        log.info("文件下载：{}", id);
+        CommonFile file = fileService.getById(id);
+        log.info("文件信息；{}", file);
+        if (file == null) {
+            throw new BaseException(CodeEnum.FILE_NOT_FOUND);
+        }
+        UploadFileUtil_Servlet3.download(response, file.getLocation(), file.getFileName());
+        log.info("文件下载结束");
+    }
+
+    @ApiOperation(value = "文件下载, 指定路径")
+    @GetMapping(value = "download/know")
+    public void downloadFile(HttpServletResponse response,  String path ) throws Exception {
+        log.info("文件下载, 指定路径：{}", path);
+        UploadFileUtil_Servlet3.download(response, path, path.substring(path.lastIndexOf(java.io.File.separator) + 1));
+        log.info("文件下载结束");
+    }
+
+
+    @ApiOperation(value = "上传图片证明文件（不大于2M）")
+    @ApiImplicitParams({
+    })
+    @RequestMapping(value = "/upload/photo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<FileVo.Upload> uploadPhone(HttpServletRequest request, @RequestParam() Part file) throws Exception {
+        log.info("文件上传:{}", file);
+        String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN);
+        JsonResponse tokenRes = tallFeignClient.getUserIdByToken(authHeader);
+        log.info("{}查询userId返回：{}", authHeader, tokenRes);
+        if (tokenRes.getCode().intValue() != CodeEnum.SUCCESS.getCode().intValue()) {
+            return tokenRes;
+        }
+        JSONObject json = JSON.parseObject(JSON.toJSONString(tokenRes.getData()));
+        Long userId = json.getLong("id");
+        FileVo.Upload vo = fileService.uploadPhone(file,userId);
+
+        return JsonResponse.newInstance().ok(vo);
+    }
+
+}

form/src/main/java/com/ccsens/form/api/FormController.java

@@ -0,0 +1,114 @@
+package com.ccsens.form.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.form.bean.dto.FormDto;
+import com.ccsens.form.bean.vo.FormVo;
+import com.ccsens.form.bean.vo.ModuleVo;
+import com.ccsens.form.service.IFormService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Api(tags = "组件相关api" , description = "")
+@RestController
+@RequestMapping("/form")
+public class FormController {
+    @Resource
+    private IFormService formService;
+
+    @MustLogin
+    @ApiOperation(value = "查找自己填写的表单信息", notes = "zy:查询表单的基本信息，组件信息，及当前用户填写的信息")
+    @RequestMapping(value = "/getOneself", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<FormVo.GetFormInfo> getOneselfFormInfo(@ApiParam @Validated @RequestBody QueryDto<FormDto.GetFormInfo> params) {
+        log.info("查找自己填写的表单信息：{}",params);
+        FormVo.GetFormInfo getFormInfo = formService.getOneselfFormInfo(params);
+        log.info("查找自己填写的表单信息完成：{}",getFormInfo);
+        return JsonResponse.newInstance().ok(getFormInfo);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查找指定用户填写的表单信息", notes = "zy:查询表单的基本信息，组件信息，及对应的用户填写的信息")
+    @RequestMapping(value = "/get", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<FormVo.GetFormInfo> getFormByFormUserId(@ApiParam @Validated @RequestBody QueryDto<FormDto.FormUser> params) {
+        log.info("查找指定用户填写的表单信息：{}",params);
+        FormVo.GetFormInfo getFormInfo = formService.getFormByFormUserId(params.getParam());
+        log.info("查找指定用户填写的表单信息完成：{}",getFormInfo);
+        return JsonResponse.newInstance().ok(getFormInfo);
+    }
+
+
+    @MustLogin
+    @ApiOperation(value = "查找填写表单的用户的列表", notes = "zy:查询该表单所有填写人的姓名和头像")
+    @RequestMapping(value = "/list", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<FormVo.FormList>> getFormList(@ApiParam @Validated @RequestBody QueryDto<FormDto.GetFormInfo> params) {
+        log.info("查找填写表单的用户的列表：{}",params);
+        List<FormVo.FormList> formLists = formService.getFormList(params.getParam());
+        log.info("查找填写表单的用户的列表完成");
+        return JsonResponse.newInstance().ok(formLists);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "统计提交的信息", notes = "zy:查询该表单填写的人数，和需要统计的组件内的统计信息")
+    @RequestMapping(value = "/statistics", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<FormVo.StatisticsForm> statisticsForm(@ApiParam @Validated @RequestBody QueryDto<FormDto.GetFormInfo> params) {
+        log.info("统计提交的信息：{}",params);
+        FormVo.StatisticsForm formLists = formService.statisticsForm(params.getParam());
+        log.info("统计提交的信息");
+        return JsonResponse.newInstance().ok(formLists);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "查找表单的基本信息，包括组件信息", notes = "zy:查询表单的基本信息包括访问路径二维码，和组件信息")
+    @RequestMapping(value = "/info", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ModuleVo.FormInfo> getFormInfo(@ApiParam @Validated @RequestBody QueryDto<FormDto.GetFormInfo> params) {
+        log.info("查找表单的基本信息：{}",params);
+        ModuleVo.FormInfo formLists = formService.getFormInfo(params.getParam());
+        log.info("查找表单的基本信息完成：{}",formLists);
+        return JsonResponse.newInstance().ok(formLists);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "添加表单", notes = "")
+    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse saveFormInfo(@ApiParam @Validated @RequestBody QueryDto<FormDto.SaveForm> params) throws Exception {
+        log.info("添加表单：{}",params);
+        formService.saveFormInfo(params.getParam(),params.getUserId());
+        log.info("添加表单成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "修改表单", notes = "")
+    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateFormInfo(@ApiParam @Validated @RequestBody QueryDto<FormDto.UpdateForm> params) {
+        log.info("修改表单：{}",params);
+        formService.updateFormInfo(params.getParam(),params.getUserId());
+        log.info("修改表单成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "删除表单", notes = "")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse deleteFormInfo(@ApiParam @Validated @RequestBody QueryDto<FormDto.GetFormInfo> params) {
+        log.info("删除表单：{}",params);
+        formService.deleteFormInfo(params.getParam(),params.getUserId());
+        log.info("删除表单成功");
+        return JsonResponse.newInstance().ok();
+    }
+}

form/src/main/java/com/ccsens/form/api/ModuleController.java

@@ -0,0 +1,94 @@
+package com.ccsens.form.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.form.bean.dto.FormDto;
+import com.ccsens.form.bean.dto.ModuleDto;
+import com.ccsens.form.bean.vo.ModuleVo;
+import com.ccsens.form.service.IModuleService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Api(tags = "组件相关api" , description = "")
+@RestController
+@RequestMapping("/module")
+public class ModuleController {
+    @Resource
+    private IModuleService moduleService;
+
+    @MustLogin
+    @ApiOperation(value = "查找所有组件模板", notes = "zy:查找所有组件模板和对应的配置信息")
+    @RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<ModuleVo.ModuleInfo>> queryModule(@ApiParam @Validated @RequestBody QueryDto params) {
+        log.info("查找所有组件模板：{}",params);
+        List<ModuleVo.ModuleInfo> moduleInfoList = moduleService.queryModule();
+        log.info("查找所有组件结果");
+        return JsonResponse.newInstance().ok(moduleInfoList);
+    }
+
+
+    @MustLogin
+    @ApiOperation(value = "查找表单内组件和配置信息", notes = "zy:查找表单内添加的组件的配置和选项信息，如果没有则返回改组价模板的默认配置")
+    @RequestMapping(value = "/get/formModule", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ModuleVo.ModuleInfo> getFormModule(@ApiParam @Validated @RequestBody QueryDto<ModuleDto.GetFormModule> params) {
+        log.info("查找表单内组件和配置信息：{}",params);
+        ModuleVo.ModuleInfo moduleInfoList = moduleService.getFormModule(params.getParam());
+        log.info("查找表单内组件和配置信息结果:{}",moduleInfoList);
+        return JsonResponse.newInstance().ok(moduleInfoList);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "修改组件的配置信息和选项", notes = "查找该组件以前添加的配置和选项信息，删除后，重新添加新的的配置和选项")
+    @RequestMapping(value = "/update/formModule", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse updateFormModule(@ApiParam @Validated @RequestBody QueryDto<ModuleDto.UpdateFormModule> params) {
+        log.info("修改组件的配置信息和选项：{}",params);
+        moduleService.updateFormModule(params.getParam(),params.getUserId());
+        log.info("修改组件的配置信息和选项成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "给表单添加组件", notes = "")
+    @RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse saveModule(@ApiParam @Validated @RequestBody QueryDto<ModuleDto.SaveModule> params) {
+        log.info("给表单添加组件：{}",params);
+        moduleService.saveModule(params.getParam(),params.getUserId());
+        log.info("给表单添加组件成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "一次添加多个组件", notes = "")
+    @RequestMapping(value = "/save/more", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse saveMoreModule(@ApiParam @Validated @RequestBody QueryDto<ModuleDto.SaveMoreModule> params) {
+        log.info("一次添加多个组件：{}",params);
+        moduleService.saveMoreModule(params.getParam(),params.getUserId());
+        log.info("一次添加多个组件成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "删除表单内的组件", notes = "")
+    @RequestMapping(value = "/delete", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse deleteFormModule(@ApiParam @Validated @RequestBody QueryDto<ModuleDto.GetFormModule> params) {
+        log.info("删除表单内的组件：{}",params);
+        moduleService.deleteFormModule(params.getParam(),params.getUserId());
+        log.info("删除表单内的组件成功");
+        return JsonResponse.newInstance().ok();
+    }
+}

form/src/main/java/com/ccsens/form/api/StatisticsController.java

@@ -0,0 +1,4 @@
+package com.ccsens.form.api;
+
+public class StatisticsController {
+}

form/src/main/java/com/ccsens/form/api/WriteController.java

@@ -0,0 +1,42 @@
+package com.ccsens.form.api;
+
+import com.ccsens.cloudutil.annotation.MustLogin;
+import com.ccsens.form.bean.dto.FormDto;
+import com.ccsens.form.bean.dto.WriteDto;
+import com.ccsens.form.bean.vo.FormVo;
+import com.ccsens.form.service.IWriteService;
+import com.ccsens.util.JsonResponse;
+import com.ccsens.util.bean.dto.QueryDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author 逗
+ */
+@Slf4j
+@Api(tags = "组件相关api" , description = "")
+@RestController
+@RequestMapping("/write")
+public class WriteController {
+    @Resource
+    private IWriteService writeService;
+
+    @MustLogin
+    @ApiOperation(value = "填写表单提交", notes = "zy:查询表单的基本信息，组件信息，及当前用户填写的信息")
+    @RequestMapping(value = "/submit", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse submitForm(@ApiParam @Validated @RequestBody QueryDto<WriteDto.SubmitWriteForm> params) {
+        log.info("填写表单提交：{}",params);
+        writeService.submitForm(params);
+        log.info("填写表单提交成功");
+        return JsonResponse.newInstance().ok();
+    }
+}

form/src/main/java/com/ccsens/form/bean/dto/FormDto.java

@@ -0,0 +1,65 @@
+package com.ccsens.form.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author 逗
+ */
+@Data
+public class FormDto {
+    @Data
+    @ApiModel("表单id")
+    public static class GetFormInfo{
+        @NotNull(message = "表单id不能为空")
+        @ApiModelProperty("表单id")
+        private Long formId;
+    }
+
+
+    @Data
+    @ApiModel("用户填写表单信息的Id")
+    public static class FormUser{
+        @NotNull(message = "用户表单关联信息的id不能为空")
+        @ApiModelProperty("用户填写表单信息的id")
+        private Long formUserId;
+    }
+
+    @Data
+    @ApiModel("添加表单")
+    public static class SaveForm{
+        @NotBlank(message = "标题不能为空")
+        @Size(max = 50,message = "标题不能超过50字")
+        @ApiModelProperty("标题")
+        private String title;
+        @ApiModelProperty("详情")
+        @Size(max = 500,message = "标题不能超过50字")
+        private String description;
+        @ApiModelProperty("封面图片文件的id")
+        private Long coverImageId;
+    }
+
+
+    @Data
+    @ApiModel("修改表单")
+    public static class UpdateForm{
+        @NotNull(message = "表单id不能为空")
+        @ApiModelProperty("表单id")
+        private Long formId;
+        @ApiModelProperty("标题")
+        @Size(max = 50,message = "标题不能超过50字")
+        private String title;
+        @ApiModelProperty("详情")
+        @Size(max = 500,message = "标题不能超过50字")
+        private String description;
+        @ApiModelProperty("封面图片文件的id")
+        private Long coverImageId;
+    }
+
+
+}

form/src/main/java/com/ccsens/form/bean/dto/ModuleDto.java

@@ -0,0 +1,86 @@
+package com.ccsens.form.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Data
+public class ModuleDto {
+    @Data
+    @ApiModel("表单内的组件id")
+    public static class GetFormModule{
+        @NotNull(message = "表单内组件id不能为空")
+        @ApiModelProperty("表单组件关联id")
+        private Long formModuleId;
+
+        public GetFormModule() {
+        }
+
+        public GetFormModule(@NotNull Long formModuleId) {
+            this.formModuleId = formModuleId;
+        }
+    }
+
+    @Data
+    @ApiModel("修改组件配置和选项")
+    public static class UpdateFormModule{
+        @NotNull
+        @ApiModelProperty("表单组件关联id")
+        private Long formModuleId;
+        @ApiModelProperty("配置信息")
+        private List<ModuleConfig> configList;
+        @ApiModelProperty("选项信息")
+        private List<ModuleOption> optionList;
+    }
+
+    @Data
+    @ApiModel("修改组件配置")
+    public static class ModuleConfig{
+        @ApiModelProperty("类型 0显示 1校验 2统计 默认0")
+        private Byte type;
+        @ApiModelProperty("组件配置code")
+        private String configKey;
+        @ApiModelProperty("配置的内容")
+        private String configValue;
+    }
+
+    @Data
+    @ApiModel("修改组件配置")
+    public static class ModuleOption{
+        @ApiModelProperty("选项配置code")
+        private String optionKey;
+        @ApiModelProperty("选项内容")
+        private String optionValue;
+        @ApiModelProperty("子选项")
+        private List<ModuleOption> subOptionList;
+    }
+
+    @Data
+    @ApiModel("给表单添加组件")
+    public static class SaveModule{
+        @NotNull(message = "表单id不能为空")
+        @ApiModelProperty("表单id")
+        private Long formId;
+        @NotNull(message = "组件id不能为空")
+        @ApiModelProperty("组件id")
+        private Long moduleId;
+    }
+
+
+    @Data
+    @ApiModel("添加多个组件")
+    public static class SaveMoreModule{
+        @NotNull(message = "表单id不能为空")
+        @ApiModelProperty("表单id")
+        private Long formId;
+        @ApiModelProperty("组件id")
+        private List<Long> moduleIdList;
+    }
+}

form/src/main/java/com/ccsens/form/bean/dto/WriteDto.java

@@ -0,0 +1,41 @@
+package com.ccsens.form.bean.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 逗
+ */
+@Data
+public class WriteDto {
+
+    @Data
+    @ApiModel("提交填写的表单")
+    public static class SubmitWriteForm{
+        @ApiModelProperty("表单id")
+        private Long formId;
+        @ApiModelProperty("表单内每个组件的信息")
+        private List<ModuleWrite> moduleList;
+    }
+
+    @Data
+    @ApiModel("表单内每个组件填写的信息")
+    public static class ModuleWrite{
+        @ApiModelProperty("表单内的组件id")
+        private Long formModuleId;
+        @ApiModelProperty("该组件的答案")
+        private List<ModuleAnswer> answerList;
+    }
+
+    @Data
+    @ApiModel("组件内的答案")
+    public static class ModuleAnswer{
+        @ApiModelProperty("选项的id")
+        private Long optionId;
+        @ApiModelProperty("答案或选项的key")
+        private String answer;
+    }
+}