diff --git a/beneficiation/.gitignore b/beneficiation/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/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/ diff --git a/beneficiation/mvnw b/beneficiation/mvnw new file mode 100644 index 00000000..3c8a5537 --- /dev/null +++ b/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 "$@" diff --git a/beneficiation/mvnw.cmd b/beneficiation/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/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% diff --git a/beneficiation/pom.xml b/beneficiation/pom.xml new file mode 100644 index 00000000..10a1ea92 --- /dev/null +++ b/beneficiation/pom.xml @@ -0,0 +1,72 @@ + + + + ccsenscloud + com.ccsens + 1.0-SNAPSHOT + + 4.0.0 + + beneficiation + + 1.8 + + + + + + cloudutil + com.ccsens + 1.0-SNAPSHOT + + + + + com.ccsens + util + 1.0-SNAPSHOT + compile + + + + + + + + org.mybatis.generator + mybatis-generator-maven-plugin + 1.3.7 + + ${basedir}/src/main/resources/mbg.xml + true + + + + mysql + mysql-connector-java + 5.1.34 + + + + + org.springframework.boot + spring-boot-maven-plugin + + com.ccsens.beneficiation.BeneficiationApplication + + + + + + repackage + + + + + + + + + + diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/BeneficiationApplication.java b/beneficiation/src/main/java/com/ccsens/beneficiation/BeneficiationApplication.java new file mode 100644 index 00000000..30701483 --- /dev/null +++ b/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); + } + +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java b/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java new file mode 100644 index 00000000..23148be1 --- /dev/null +++ b/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("测试"); + } + + +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/api/WeightController.java b/beneficiation/src/main/java/com/ccsens/beneficiation/api/WeightController.java new file mode 100644 index 00000000..5dc7cde2 --- /dev/null +++ b/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> queryWeight(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("统计每天的重量：{}",params); + List 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 queryWeightTotal(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("重量累计表格：{}",params); + WeightVo.WeightTotal weightTotal = weightService.queryWeightTotal(params.getParam()); + log.info("重量累计表格返回"); + return JsonResponse.newInstance().ok(weightTotal); + } +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/Message/BaseMessageDto.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/Message/BaseMessageDto.java new file mode 100644 index 00000000..74a199bd --- /dev/null +++ b/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 userIdToUsers(List userIds) { + List 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 receivers; +// private Object data; + + public Set receiversTransTos() { + Set 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; + } +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/Message/BeneficiationMessageDto.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/Message/BeneficiationMessageDto.java new file mode 100644 index 00000000..f1a021dd --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/Message/BeneficiationMessageDto.java @@ -0,0 +1,63 @@ +package com.ccsens.beneficiation.bean.dto.Message; + +import lombok.Data; + +/** + * @author 逗 + */ +@Data +public class BeneficiationMessageDto { + /** + * 设备编号 + */ + private String authId; + /** + * 类型 0变频器 1皮带秤 2电磁阀 3流量计 4电耳 5每日称重信息 6界限值 7触碰界限值后更改记录 + */ + private Byte type; + /** + * 寄存器地址 + */ + private int addr; + /** + * 类型对应的值， + */ + private String value; + /** + * 版本号 + */ + private String version; + /** + * 时间 + */ + private Long time = System.currentTimeMillis(); + + public Byte getType(){ + if(this.type != null){ + return type; + } + switch (addr){ + case 21: + return 0; + case 22: + return 1; + case 23: + return 2; + case 24: + return 3; + case 25: + return 4; + case 26: + return 5; + case 27: + case 28: + case 29: + return 6; + case 30: //触碰到的界限的信息（） + return 7; + default: + return type; + } + } + +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/WeightDto.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/WeightDto.java new file mode 100644 index 00000000..cbb74ed9 --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/dto/WeightDto.java @@ -0,0 +1,52 @@ +package com.ccsens.beneficiation.bean.dto; + +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("日期 为空则默认当前") + private Date datetime; + + } +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/AdjustRecord.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/AdjustRecord.java new file mode 100644 index 00000000..bfdf08f6 --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/AdjustRecordExample.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/AdjustRecordExample.java new file mode 100644 index 00000000..8ac0dbe5 --- /dev/null +++ b/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 oredCriteria; + + public AdjustRecordExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List 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 values) { + addCriterion("monitoring_id in", values, "monitoringId"); + return (Criteria) this; + } + + public Criteria andMonitoringIdNotIn(List 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 values) { + addCriterion("monitoring_value in", values, "monitoringValue"); + return (Criteria) this; + } + + public Criteria andMonitoringValueNotIn(List 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 values) { + addCriterion("threshold_id in", values, "thresholdId"); + return (Criteria) this; + } + + public Criteria andThresholdIdNotIn(List 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 values) { + addCriterion("equipment_id in", values, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdNotIn(List 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 values) { + addCriterion("before_value in", values, "beforeValue"); + return (Criteria) this; + } + + public Criteria andBeforeValueNotIn(List 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 values) { + addCriterion("after_value in", values, "afterValue"); + return (Criteria) this; + } + + public Criteria andAfterValueNotIn(List 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 values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List 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 values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List 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 values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List 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 values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Equipment.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Equipment.java new file mode 100644 index 00000000..c46e53ea --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Equipment.java @@ -0,0 +1,117 @@ +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 addr; + + 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 getAddr() { + return addr; + } + + public void setAddr(String addr) { + this.addr = addr == null ? null : addr.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(", addr=").append(addr); + 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(); + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/EquipmentExample.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/EquipmentExample.java new file mode 100644 index 00000000..9abef3e6 --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/EquipmentExample.java @@ -0,0 +1,771 @@ +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 oredCriteria; + + public EquipmentExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List 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 values) { + addCriterion("auth_id in", values, "authId"); + return (Criteria) this; + } + + public Criteria andAuthIdNotIn(List 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 andAddrIsNull() { + addCriterion("addr is null"); + return (Criteria) this; + } + + public Criteria andAddrIsNotNull() { + addCriterion("addr is not null"); + return (Criteria) this; + } + + public Criteria andAddrEqualTo(String value) { + addCriterion("addr =", value, "addr"); + return (Criteria) this; + } + + public Criteria andAddrNotEqualTo(String value) { + addCriterion("addr <>", value, "addr"); + return (Criteria) this; + } + + public Criteria andAddrGreaterThan(String value) { + addCriterion("addr >", value, "addr"); + return (Criteria) this; + } + + public Criteria andAddrGreaterThanOrEqualTo(String value) { + addCriterion("addr >=", value, "addr"); + return (Criteria) this; + } + + public Criteria andAddrLessThan(String value) { + addCriterion("addr <", value, "addr"); + return (Criteria) this; + } + + public Criteria andAddrLessThanOrEqualTo(String value) { + addCriterion("addr <=", value, "addr"); + return (Criteria) this; + } + + public Criteria andAddrLike(String value) { + addCriterion("addr like", value, "addr"); + return (Criteria) this; + } + + public Criteria andAddrNotLike(String value) { + addCriterion("addr not like", value, "addr"); + return (Criteria) this; + } + + public Criteria andAddrIn(List values) { + addCriterion("addr in", values, "addr"); + return (Criteria) this; + } + + public Criteria andAddrNotIn(List values) { + addCriterion("addr not in", values, "addr"); + return (Criteria) this; + } + + public Criteria andAddrBetween(String value1, String value2) { + addCriterion("addr between", value1, value2, "addr"); + return (Criteria) this; + } + + public Criteria andAddrNotBetween(String value1, String value2) { + addCriterion("addr not between", value1, value2, "addr"); + 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 values) { + addCriterion("verion in", values, "verion"); + return (Criteria) this; + } + + public Criteria andVerionNotIn(List 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 values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List 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 values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List 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 values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List 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 values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Record.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Record.java new file mode 100644 index 00000000..0c683738 --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Record.java @@ -0,0 +1,106 @@ +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 String value; + + 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 getValue() { + return value; + } + + public void setValue(String value) { + this.value = value == null ? null : value.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(", 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("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/RecordExample.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/RecordExample.java new file mode 100644 index 00000000..e15570e1 --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/RecordExample.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 RecordExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public RecordExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("equipment_id in", values, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdNotIn(List 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(String value) { + addCriterion("value =", value, "value"); + return (Criteria) this; + } + + public Criteria andValueNotEqualTo(String value) { + addCriterion("value <>", value, "value"); + return (Criteria) this; + } + + public Criteria andValueGreaterThan(String value) { + addCriterion("value >", value, "value"); + return (Criteria) this; + } + + public Criteria andValueGreaterThanOrEqualTo(String value) { + addCriterion("value >=", value, "value"); + return (Criteria) this; + } + + public Criteria andValueLessThan(String value) { + addCriterion("value <", value, "value"); + return (Criteria) this; + } + + public Criteria andValueLessThanOrEqualTo(String value) { + addCriterion("value <=", value, "value"); + return (Criteria) this; + } + + public Criteria andValueLike(String value) { + addCriterion("value like", value, "value"); + return (Criteria) this; + } + + public Criteria andValueNotLike(String value) { + addCriterion("value not like", value, "value"); + return (Criteria) this; + } + + public Criteria andValueIn(List values) { + addCriterion("value in", values, "value"); + return (Criteria) this; + } + + public Criteria andValueNotIn(List values) { + addCriterion("value not in", values, "value"); + return (Criteria) this; + } + + public Criteria andValueBetween(String value1, String value2) { + addCriterion("value between", value1, value2, "value"); + return (Criteria) this; + } + + public Criteria andValueNotBetween(String value1, String 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 values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List 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 values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List 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 values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List 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 values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List 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 values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/ThresholdValue.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/ThresholdValue.java new file mode 100644 index 00000000..0f81e7bc --- /dev/null +++ b/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 Byte type; + + 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 Byte getType() { + return type; + } + + public void setType(Byte type) { + this.type = type; + } + + 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(", type=").append(type); + 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(); + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/ThresholdValueExample.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/ThresholdValueExample.java new file mode 100644 index 00000000..16d1850a --- /dev/null +++ b/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 oredCriteria; + + public ThresholdValueExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("type in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List 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 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 values) { + addCriterion("stages in", values, "stages"); + return (Criteria) this; + } + + public Criteria andStagesNotIn(List 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 values) { + addCriterion("max in", values, "max"); + return (Criteria) this; + } + + public Criteria andMaxNotIn(List 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 values) { + addCriterion("min in", values, "min"); + return (Criteria) this; + } + + public Criteria andMinNotIn(List 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 values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List 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 values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List 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 values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List 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 values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Weight.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/Weight.java new file mode 100644 index 00000000..a3bfbc09 --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/WeightExample.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/po/WeightExample.java new file mode 100644 index 00000000..064c0435 --- /dev/null +++ b/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 oredCriteria; + + public WeightExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("equipment_id in", values, "equipmentId"); + return (Criteria) this; + } + + public Criteria andEquipmentIdNotIn(List 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 values) { + addCriterion("weight in", values, "weight"); + return (Criteria) this; + } + + public Criteria andWeightNotIn(List 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 values) { + addCriterion("time in", values, "time"); + return (Criteria) this; + } + + public Criteria andTimeNotIn(List 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 values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List 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 values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List 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 values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List 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 values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/WeightVo.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/WeightVo.java new file mode 100644 index 00000000..5513193d --- /dev/null +++ b/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; + } +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/config/BeanConfig.java b/beneficiation/src/main/java/com/ccsens/beneficiation/config/BeanConfig.java new file mode 100644 index 00000000..da7a584d --- /dev/null +++ b/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; + } +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/config/SpringConfig.java b/beneficiation/src/main/java/com/ccsens/beneficiation/config/SpringConfig.java new file mode 100644 index 00000000..7735b9e9 --- /dev/null +++ b/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 responseStringConverter() { + StringHttpMessageConverter converter = new StringHttpMessageConverter( + Charset.forName("UTF-8")); + return converter; + } + + @Bean + public HttpMessageConverter responseJsonConverter(){ + MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); + List 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> 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)); + } +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/config/SwaggerConfigure.java b/beneficiation/src/main/java/com/ccsens/beneficiation/config/SwaggerConfigure.java new file mode 100644 index 00000000..f17c2d90 --- /dev/null +++ b/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 setHeaderToken() { + ParameterBuilder tokenPar = new ParameterBuilder(); + List 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; + } +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/intercept/MybatisInterceptor.java b/beneficiation/src/main/java/com/ccsens/beneficiation/intercept/MybatisInterceptor.java new file mode 100644 index 00000000..2a94247e --- /dev/null +++ b/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; + } + } + +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/persist/dao/RecordDao.java b/beneficiation/src/main/java/com/ccsens/beneficiation/persist/dao/RecordDao.java new file mode 100644 index 00000000..12033671 --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/persist/dao/RecordDao.java @@ -0,0 +1,12 @@ +package com.ccsens.beneficiation.persist.dao; + +import com.ccsens.beneficiation.bean.po.Record; +import com.ccsens.beneficiation.persist.mapper.RecordMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +@Repository +public interface RecordDao extends RecordMapper { + + Record getByTypeAndAuthId(@Param("type") byte type,@Param("authId")String authId); +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/persist/dao/WeightDao.java b/beneficiation/src/main/java/com/ccsens/beneficiation/persist/dao/WeightDao.java new file mode 100644 index 00000000..42b6f577 --- /dev/null +++ b/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 queryWeightDay(WeightDto.GetWeightByDay param); + + /** + * 重量累计 + * @param datetime + * @return + */ + WeightVo.WeightTotal queryWeightTotal(@Param("datetime") Date datetime); +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/AdjustRecordMapper.java b/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/AdjustRecordMapper.java new file mode 100644 index 00000000..6a5a94c5 --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/EquipmentMapper.java b/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/EquipmentMapper.java new file mode 100644 index 00000000..fb81530c --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/RecordMapper.java b/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/RecordMapper.java new file mode 100644 index 00000000..576a546d --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/ThresholdValueMapper.java b/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/ThresholdValueMapper.java new file mode 100644 index 00000000..0e82ca15 --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/WeightMapper.java b/beneficiation/src/main/java/com/ccsens/beneficiation/persist/mapper/WeightMapper.java new file mode 100644 index 00000000..7cf0b7e6 --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/rabbitMQ/RabbitController.java b/beneficiation/src/main/java/com/ccsens/beneficiation/rabbitMQ/RabbitController.java new file mode 100644 index 00000000..6e22769f --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/rabbitMQ/RabbitController.java @@ -0,0 +1,60 @@ +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.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 RedisUtil redisUtil; + @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 messageSet = outMessageSet.getMessageSet(); + if (CollectionUtil.isEmpty(messageSet)) { + return; + } + messageSet.forEach(outMessage -> { + BeneficiationMessageDto carRecordMessageDto = JSONObject.parseObject(outMessage.getData(), BeneficiationMessageDto.class); + recordService.processMessage(carRecordMessageDto); + }); + + } catch (Exception e) { + log.error("消息JSON转换异常", e); + } + } + + +} \ No newline at end of file diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/service/IRecordService.java b/beneficiation/src/main/java/com/ccsens/beneficiation/service/IRecordService.java new file mode 100644 index 00000000..77407727 --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/service/IRecordService.java @@ -0,0 +1,10 @@ +package com.ccsens.beneficiation.service; + +import com.ccsens.beneficiation.bean.dto.Message.BeneficiationMessageDto; + +public interface IRecordService { + /** + * 处理消息消息 + */ + void processMessage(BeneficiationMessageDto carRecordMessageDto); +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/service/IWeightService.java b/beneficiation/src/main/java/com/ccsens/beneficiation/service/IWeightService.java new file mode 100644 index 00000000..70630189 --- /dev/null +++ b/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 queryWeightDay(WeightDto.GetWeightByDay param); + + /** + * 重量累计 + * @param param 日期 + * @return 返回 天 周 月 年 分别的累计 + */ + WeightVo.WeightTotal queryWeightTotal(WeightDto.GetWeightTotal param); +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/service/RecordService.java b/beneficiation/src/main/java/com/ccsens/beneficiation/service/RecordService.java new file mode 100644 index 00000000..d34e2b61 --- /dev/null +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/service/RecordService.java @@ -0,0 +1,128 @@ +package com.ccsens.beneficiation.service; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import com.ccsens.beneficiation.bean.dto.Message.BeneficiationMessageDto; +import com.ccsens.beneficiation.bean.po.*; +import com.ccsens.beneficiation.persist.dao.RecordDao; +import com.ccsens.beneficiation.persist.mapper.AdjustRecordMapper; +import com.ccsens.beneficiation.persist.mapper.EquipmentMapper; +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.Date; +import java.util.List; + +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class RecordService implements IRecordService{ + @Resource + private RecordDao recordDao; + @Resource + private EquipmentMapper equipmentMapper; + @Resource + private Snowflake snowflake; + @Resource + private WeightMapper weightMapper; + @Resource + private ThresholdValueMapper thresholdValueMapper; + @Resource + private AdjustRecordMapper adjustRecordMapper; + + @Override + public void processMessage(BeneficiationMessageDto beneficiation) { + //查找设备。没有则添加一个 + Equipment equipment; + EquipmentExample equipmentExample = new EquipmentExample(); + equipmentExample.createCriteria().andTypeEqualTo(beneficiation.getType()).andAuthIdEqualTo(beneficiation.getAuthId()); + List equipmentList = equipmentMapper.selectByExample(equipmentExample); + if(CollectionUtil.isNotEmpty(equipmentList)){ + equipment = equipmentList.get(0); + }else { + equipment = new Equipment(); + equipment.setId(snowflake.nextId()); + equipment.setType(beneficiation.getType()); + equipment.setAuthId(beneficiation.getAuthId()); + equipment.setVerion(beneficiation.getVersion()); + equipmentMapper.insertSelective(equipment); + } + //判断类型 + switch (beneficiation.getType()){ + case 5: + //称重信息 + Weight weight = new Weight(); + weight.setId(snowflake.nextId()); + weight.setEquipmentId(equipment.getId()); + weight.setWeight(beneficiation.getValue()); + weight.setTime(new Date(beneficiation.getTime())); + weightMapper.insertSelective(weight); + break; + case 6: + //添加界限值信息 + break; + case 7: + //查找界限值信息 + ThresholdValueExample thresholdValueExample = new ThresholdValueExample(); + thresholdValueExample.createCriteria().andTypeEqualTo(equipment.getType()).andStagesEqualTo(Byte.parseByte(beneficiation.getValue())); + List thresholdValueList = thresholdValueMapper.selectByExample(thresholdValueExample); + if(CollectionUtil.isNotEmpty(thresholdValueList)){ + //添加调整记录 + AdjustRecord adjustRecord = new AdjustRecord(); + adjustRecord.setId(snowflake.nextId()); + adjustRecord.setMonitoringId(equipment.getId()); + adjustRecord.setThresholdId(thresholdValueList.get(0).getId()); + adjustRecordMapper.insertSelective(adjustRecord); + } + break; + default: + //否则是设备基本信息 + saveEquipmentRecord(beneficiation); + + } + } + + private void saveEquipmentRecord(BeneficiationMessageDto beneficiation) { + //查找设备。没有则添加一个 + Long equipmentId; + EquipmentExample equipmentExample = new EquipmentExample(); + equipmentExample.createCriteria().andTypeEqualTo(beneficiation.getType()).andAuthIdEqualTo(beneficiation.getAuthId()); + List equipmentList = equipmentMapper.selectByExample(equipmentExample); + if(CollectionUtil.isNotEmpty(equipmentList)){ + equipmentId = equipmentList.get(0).getId(); + }else { + Equipment equipment = new Equipment(); + equipment.setId(snowflake.nextId()); + equipment.setType(beneficiation.getType()); + equipment.setAuthId(beneficiation.getAuthId()); + equipment.setVerion(beneficiation.getVersion()); + equipmentMapper.insertSelective(equipment); + equipmentId = equipment.getId(); + } + // 查询该设备上一条最新信息，如果值相同，则不添加 + RecordExample recordExample = new RecordExample(); + recordExample.createCriteria().andEquipmentIdEqualTo(equipmentId); + recordExample.setOrderByClause("time DESC Limit 1"); + List records = recordDao.selectByExample(recordExample); + if(CollectionUtil.isEmpty(records)){ + Record record = new Record(); + record.setId(snowflake.nextId()); + record.setEquipmentId(equipmentId); + record.setValue(beneficiation.getValue()); + record.setTime(new Date(System.currentTimeMillis())); + recordDao.insertSelective(record); + }else if(!records.get(0).getValue().equalsIgnoreCase(beneficiation.getValue())){ + Record record = new Record(); + record.setId(snowflake.nextId()); + record.setEquipmentId(equipmentId); + record.setValue(beneficiation.getValue()); + record.setTime(new Date(System.currentTimeMillis())); + recordDao.insertSelective(record); + } + } +} diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/service/WeightService.java b/beneficiation/src/main/java/com/ccsens/beneficiation/service/WeightService.java new file mode 100644 index 00000000..f421458f --- /dev/null +++ b/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 queryWeightDay(WeightDto.GetWeightByDay param) { + return weightDao.queryWeightDay(param); + } + + @Override + public WeightVo.WeightTotal queryWeightTotal(WeightDto.GetWeightTotal param) { + return weightDao.queryWeightTotal(param.getDatetime()); + } +} diff --git a/beneficiation/src/main/resources/application-common.yml b/beneficiation/src/main/resources/application-common.yml new file mode 100644 index 00000000..b870f11f --- /dev/null +++ b/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 + diff --git a/beneficiation/src/main/resources/application-dev.yml b/beneficiation/src/main/resources/application-dev.yml new file mode 100644 index 00000000..4569c331 --- /dev/null +++ b/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: \ No newline at end of file diff --git a/beneficiation/src/main/resources/application-prod.yml b/beneficiation/src/main/resources/application-prod.yml new file mode 100644 index 00000000..fe1f5636 --- /dev/null +++ b/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: 192.144.182.42 + +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/ \ No newline at end of file diff --git a/beneficiation/src/main/resources/application-test.yml b/beneficiation/src/main/resources/application-test.yml new file mode 100644 index 00000000..51902270 --- /dev/null +++ b/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: 192.168.0.99 +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/ diff --git a/beneficiation/src/main/resources/application.yml b/beneficiation/src/main/resources/application.yml new file mode 100644 index 00000000..1ac895fc --- /dev/null +++ b/beneficiation/src/main/resources/application.yml @@ -0,0 +1,6 @@ +spring: + profiles: + active: prod + include: common, util-prod + + diff --git a/beneficiation/src/main/resources/druid-dev.yml b/beneficiation/src/main/resources/druid-dev.yml new file mode 100644 index 00000000..d803e1c2 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/beneficiation/src/main/resources/druid-prod.yml b/beneficiation/src/main/resources/druid-prod.yml new file mode 100644 index 00000000..ff608f57 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/beneficiation/src/main/resources/druid-test.yml b/beneficiation/src/main/resources/druid-test.yml new file mode 100644 index 00000000..7e5f71a0 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/beneficiation/src/main/resources/logback-spring.xml b/beneficiation/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..acba1451 --- /dev/null +++ b/beneficiation/src/main/resources/logback-spring.xml @@ -0,0 +1,196 @@ + + + + + + + + + + logback + + + + + + + + + + + + + + + + + info + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + + + ${log.path}/log_debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/log_info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/log_warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + + ${log.path}/log_error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/beneficiation/src/main/resources/mapper_dao/RecordDao.xml b/beneficiation/src/main/resources/mapper_dao/RecordDao.xml new file mode 100644 index 00000000..4a9fcbb3 --- /dev/null +++ b/beneficiation/src/main/resources/mapper_dao/RecordDao.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/beneficiation/src/main/resources/mapper_dao/WeightDao.xml b/beneficiation/src/main/resources/mapper_dao/WeightDao.xml new file mode 100644 index 00000000..d6ed1edf --- /dev/null +++ b/beneficiation/src/main/resources/mapper_dao/WeightDao.xml @@ -0,0 +1,73 @@ + + + + + + + + \ No newline at end of file diff --git a/beneficiation/src/main/resources/mapper_raw/AdjustRecordMapper.xml b/beneficiation/src/main/resources/mapper_raw/AdjustRecordMapper.xml new file mode 100644 index 00000000..b249732a --- /dev/null +++ b/beneficiation/src/main/resources/mapper_raw/AdjustRecordMapper.xml @@ -0,0 +1,323 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, time, monitoring_id, monitoring_value, threshold_id, equipment_id, before_value, + after_value, operator, created_at, updated_at, rec_status + + + + + delete from t_adjust_record + where id = #{id,jdbcType=BIGINT} + + + delete from t_adjust_record + + + + + + 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 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, + + + + + #{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}, + + + + + + update t_adjust_record + + + 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}, + + + + + + + + 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} + + + + + + update t_adjust_record + + + 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 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} + + \ No newline at end of file diff --git a/beneficiation/src/main/resources/mapper_raw/EquipmentMapper.xml b/beneficiation/src/main/resources/mapper_raw/EquipmentMapper.xml new file mode 100644 index 00000000..77aee8e6 --- /dev/null +++ b/beneficiation/src/main/resources/mapper_raw/EquipmentMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, type, auth_id, addr, verion, operator, created_at, updated_at, rec_status + + + + + delete from t_equipment + where id = #{id,jdbcType=BIGINT} + + + delete from t_equipment + + + + + + insert into t_equipment (id, type, auth_id, + addr, verion, operator, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{authId,jdbcType=VARCHAR}, + #{addr,jdbcType=VARCHAR}, #{verion,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_equipment + + + id, + + + type, + + + auth_id, + + + addr, + + + verion, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{type,jdbcType=TINYINT}, + + + #{authId,jdbcType=VARCHAR}, + + + #{addr,jdbcType=VARCHAR}, + + + #{verion,jdbcType=VARCHAR}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_equipment + + + id = #{record.id,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=TINYINT}, + + + auth_id = #{record.authId,jdbcType=VARCHAR}, + + + addr = #{record.addr,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}, + + + + + + + + update t_equipment + set id = #{record.id,jdbcType=BIGINT}, + type = #{record.type,jdbcType=TINYINT}, + auth_id = #{record.authId,jdbcType=VARCHAR}, + addr = #{record.addr,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} + + + + + + update t_equipment + + + type = #{type,jdbcType=TINYINT}, + + + auth_id = #{authId,jdbcType=VARCHAR}, + + + addr = #{addr,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 t_equipment + set type = #{type,jdbcType=TINYINT}, + auth_id = #{authId,jdbcType=VARCHAR}, + addr = #{addr,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} + + \ No newline at end of file diff --git a/beneficiation/src/main/resources/mapper_raw/RecordMapper.xml b/beneficiation/src/main/resources/mapper_raw/RecordMapper.xml new file mode 100644 index 00000000..89d70a9c --- /dev/null +++ b/beneficiation/src/main/resources/mapper_raw/RecordMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, equipment_id, value, time, operator, created_at, updated_at, rec_status + + + + + delete from t_record + where id = #{id,jdbcType=BIGINT} + + + delete from t_record + + + + + + insert into t_record (id, equipment_id, value, + time, operator, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{equipmentId,jdbcType=BIGINT}, #{value,jdbcType=VARCHAR}, + #{time,jdbcType=TIMESTAMP}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_record + + + id, + + + equipment_id, + + + value, + + + time, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{equipmentId,jdbcType=BIGINT}, + + + #{value,jdbcType=VARCHAR}, + + + #{time,jdbcType=TIMESTAMP}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_record + + + id = #{record.id,jdbcType=BIGINT}, + + + equipment_id = #{record.equipmentId,jdbcType=BIGINT}, + + + value = #{record.value,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}, + + + + + + + + update t_record + set id = #{record.id,jdbcType=BIGINT}, + equipment_id = #{record.equipmentId,jdbcType=BIGINT}, + value = #{record.value,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} + + + + + + update t_record + + + equipment_id = #{equipmentId,jdbcType=BIGINT}, + + + value = #{value,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 t_record + set equipment_id = #{equipmentId,jdbcType=BIGINT}, + value = #{value,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} + + \ No newline at end of file diff --git a/beneficiation/src/main/resources/mapper_raw/ThresholdValueMapper.xml b/beneficiation/src/main/resources/mapper_raw/ThresholdValueMapper.xml new file mode 100644 index 00000000..ccddfdd5 --- /dev/null +++ b/beneficiation/src/main/resources/mapper_raw/ThresholdValueMapper.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, type, stages, max, min, operator, created_at, updated_at, rec_status + + + + + delete from t_threshold_value + where id = #{id,jdbcType=BIGINT} + + + delete from t_threshold_value + + + + + + insert into t_threshold_value (id, type, stages, + max, min, operator, + created_at, updated_at, rec_status + ) + values (#{id,jdbcType=BIGINT}, #{type,jdbcType=TINYINT}, #{stages,jdbcType=TINYINT}, + #{max,jdbcType=INTEGER}, #{min,jdbcType=INTEGER}, #{operator,jdbcType=BIGINT}, + #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} + ) + + + insert into t_threshold_value + + + id, + + + type, + + + stages, + + + max, + + + min, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{type,jdbcType=TINYINT}, + + + #{stages,jdbcType=TINYINT}, + + + #{max,jdbcType=INTEGER}, + + + #{min,jdbcType=INTEGER}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_threshold_value + + + id = #{record.id,jdbcType=BIGINT}, + + + type = #{record.type,jdbcType=TINYINT}, + + + 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}, + + + + + + + + update t_threshold_value + set id = #{record.id,jdbcType=BIGINT}, + type = #{record.type,jdbcType=TINYINT}, + 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} + + + + + + update t_threshold_value + + + type = #{type,jdbcType=TINYINT}, + + + 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 t_threshold_value + set type = #{type,jdbcType=TINYINT}, + 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} + + \ No newline at end of file diff --git a/beneficiation/src/main/resources/mapper_raw/WeightMapper.xml b/beneficiation/src/main/resources/mapper_raw/WeightMapper.xml new file mode 100644 index 00000000..df2f528a --- /dev/null +++ b/beneficiation/src/main/resources/mapper_raw/WeightMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, equipment_id, weight, time, operator, created_at, updated_at, rec_status + + + + + delete from t_weight + where id = #{id,jdbcType=BIGINT} + + + delete from t_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 into t_weight + + + id, + + + equipment_id, + + + weight, + + + time, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{equipmentId,jdbcType=BIGINT}, + + + #{weight,jdbcType=VARCHAR}, + + + #{time,jdbcType=TIMESTAMP}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_weight + + + 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}, + + + + + + + + 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} + + + + + + update t_weight + + + 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 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} + + \ No newline at end of file diff --git a/beneficiation/src/main/resources/mybatis/mybatis-config.xml b/beneficiation/src/main/resources/mybatis/mybatis-config.xml new file mode 100644 index 00000000..e5a218dd --- /dev/null +++ b/beneficiation/src/main/resources/mybatis/mybatis-config.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6b864104..948a1c1f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,8 @@ wisdomcar - form + beneficiation + diff --git a/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java b/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java index 36fcb675..7d909550 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java +++ b/tall/src/main/java/com/ccsens/tall/bean/dto/PluginDto.java @@ -114,4 +114,14 @@ public class PluginDto { } } + + @Data + @ApiModel("获取每日会议记录") + public static class GetMinutesDay { + @ApiModelProperty("任务日期id") + @NotNull(message = "任务id不能为空") + private Long taskId; + } + + } diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java index 7e85e912..be62e06f 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/RoleVo.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @author 逗 */ @@ -30,4 +32,28 @@ public class RoleVo { @ApiModelProperty("userId") private Long userId; } + + @Data + @ApiModel("角色下的任务") + public static class RoleTask{ + @ApiModelProperty("角色id") + private Long roleId; + @ApiModelProperty("角色名") + private String roleName; + @ApiModelProperty("任务名") + private List taskList; + } + + @Data + @ApiModel("角色下的任务详情") + public static class RoleTaskInfo{ + @ApiModelProperty("任务日期id") + private Long taskId; + @ApiModelProperty("任务详情id") + private Long detailId; + @ApiModelProperty("任务名") + private String taskName; + @ApiModelProperty("检查人") + private String checkerName; + } } diff --git a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java index 3314a123..440eb3af 100644 --- a/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java +++ b/tall/src/main/java/com/ccsens/tall/persist/dao/ProRoleDao.java @@ -60,6 +60,15 @@ public interface ProRoleDao extends ProRoleMapper{ */ List queryRoleByProjectId(@Param("projectId")Long projectId); + /** + * 获取项目下每个角色当天的任务 + * @param projectId 项目id + * @param thisDayStartTime 今天的开始时间 + * @param thisDayEndTime 今天的结束时间 + * @return 返回 + */ + List getRoleTaskByProjectId(@Param("projectId")Long projectId, @Param("thisDayStartTime")long thisDayStartTime, @Param("thisDayEndTime")long thisDayEndTime); + // /** // * 查找项目下的所有成员的名字用“，”分隔 // * @param projectId 项目id diff --git a/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java b/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java index c0648abb..3636ab90 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExportWbsService.java @@ -14,7 +14,6 @@ import com.ccsens.tall.persist.dao.*; import com.ccsens.util.PoiUtil; import com.ccsens.util.PropUtil; import com.ccsens.util.WebConstant; -import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -24,7 +23,6 @@ import org.springframework.core.io.ResourceLoader; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.unit.DataUnit; import java.io.*; import java.math.BigDecimal; diff --git a/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java b/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java index 1437612b..773c9fd7 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ITaskPluginService.java @@ -5,6 +5,7 @@ import com.ccsens.tall.bean.po.ProTaskPlugin; import com.ccsens.tall.bean.vo.PluginVo; import com.ccsens.tall.bean.vo.TaskVo; +import java.io.FileNotFoundException; import java.util.List; /** @@ -75,4 +76,13 @@ public interface ITaskPluginService { * @return */ PluginVo.PersonalTaskReport getPersonalTaskReport(Long projectId); + + /** + * 获取每日会议纪要 + * @param currentUserId userId + * @param getMinutesDay 任务日期id + * @param token roken + * @return 返回文件的访问路径，下载路径和文件id + */ + List saveMinutesDay(Long currentUserId, PluginDto.GetMinutesDay getMinutesDay, String token) throws FileNotFoundException, Exception; } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java index 58ffdde5..cde7541d 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProMemberService.java @@ -322,11 +322,16 @@ public class ProMemberService implements IProMemberService { } //添加用户关注项目信息 if(ObjectUtil.isNotNull(userId)) { - UserAttention userAttention = new UserAttention(); - userAttention.setId(snowflake.nextId()); - userAttention.setUserId(userId); - userAttention.setProjectId(saveMember.getProjectId()); - userAttentionDao.insertSelective(userAttention); + //查找此用户是否以关注项目 + UserAttentionExample attentionExample = new UserAttentionExample(); + attentionExample.createCriteria().andProjectIdEqualTo(saveMember.getProjectId()).andUserIdEqualTo(userId); + if(userAttentionDao.countByExample(attentionExample) <= 0){ + UserAttention userAttention = new UserAttention(); + userAttention.setId(snowflake.nextId()); + userAttention.setUserId(userId); + userAttention.setProjectId(saveMember.getProjectId()); + userAttentionDao.insertSelective(userAttention); + } } } else { throw new BaseException(CodeEnum.NOT_POWER); diff --git a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java index d0b29080..67dfd654 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProRoleService.java @@ -259,7 +259,7 @@ public class ProRoleService implements IProRoleService { SysProject project = projectDao.selectByPrimaryKey(projectId); if (ObjectUtil.isNotNull(project)) { if (project.getCreatorId().longValue() == userId) { - power = 2; + power = 3; } List roles = getProRoleByProjectIdAndUserId(projectId, userId); if (CollectionUtil.isNotEmpty(roles)) { @@ -269,6 +269,7 @@ public class ProRoleService implements IProRoleService { } } } + log.info("查找userId:{}在项目:{}内的权限：{}",userId,projectId,power); return power; } diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 077a72ae..f348b817 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -1343,7 +1343,8 @@ public class ProTaskDetailService implements IProTaskDetailService { ObjectUtil.isNotNull(updateTaskInfo.getEndTime()) || StrUtil.isNotEmpty(updateTaskInfo.getCycle())) { //一级任务没有时间，不能修改 - if (taskDetail.getLevel() != 1 && taskDetail.getLevel() != 0) { +// if (taskDetail.getLevel() != 1 && taskDetail.getLevel() != 0) { + if (taskDetail.getLevel() != 0) { changeTime(taskDetail, updateTaskInfo.getBeginTime(), updateTaskInfo.getEndTime(), project); if (StrUtil.isNotEmpty(updateTaskInfo.getCycle())) { taskDetail.setCycle(updateTaskInfo.getCycle()); @@ -1454,7 +1455,7 @@ public class ProTaskDetailService implements IProTaskDetailService { throw new BaseException(CodeEnum.TIME_ERROR_PROJECT); } - if (taskDetail.getLevel() == 2) { + if (taskDetail.getLevel() == 2 || taskDetail.getLevel() == 1) { //组任务不能修改时间（组任务的时间是其子任务的最早和最晚的时间） if (taskDetail.getHasGroup() == 1) { throw new BaseException(CodeEnum.HAS_GROUP_TIME_CHANGE); diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java index c399ecea..d5ab692a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -106,7 +106,8 @@ public class TaskDeliverService implements ITaskDeliverService { if (CollectionUtil.isNotEmpty(postLogList)) { ProTaskDeliverPostLog postLog = postLogList.get(0); SysCommitedFile file = commitedFileDao.selectByPrimaryKey(postLog.getFileId()); - deliverInfoByMvp.setUrl(WebConstant.TEST_URL_BASE + file.getPath()); +// deliverInfoByMvp.setUrl(WebConstant.TEST_URL_BASE + file.getPath()); + deliverInfoByMvp.setUrl(PropUtil.imgDomain + "/" + file.getPath()); ProTaskDeliverPostLogCheckerExample checkerExample = new ProTaskDeliverPostLogCheckerExample(); checkerExample.createCriteria().andDeliverPostLogIdEqualTo(postLog.getId()); @@ -183,7 +184,7 @@ public class TaskDeliverService implements ITaskDeliverService { ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole()); Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId(),null); if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole){ - throw new BaseException(CodeEnum.NOT_CHECKER); + throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); } //查找以前上传的不为历史信息的文件。改为历史信息 ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample(); @@ -292,7 +293,8 @@ public class TaskDeliverService implements ITaskDeliverService { List deliverInfoList = taskDeliverDao.selectByDeliverId(uploadDeliver.getDeliverId()); if (CollectionUtil.isNotEmpty(deliverInfoList)) { deliverInfo = deliverInfoList.get(0); - deliverInfo.setUrl(WebConstant.TEST_URL_BASE + deliverInfo.getUrl()); +// deliverInfo.setUrl(WebConstant.TEST_URL_BASE + deliverInfo.getUrl()); + deliverInfo.setUrl(PropUtil.imgDomain + "/" + deliverInfo.getUrl()); } return deliverInfo; } @@ -451,7 +453,8 @@ public class TaskDeliverService implements ITaskDeliverService { } //修改文件路径为可下载路径 if(StrUtil.isNotEmpty(filePath.getUrl())) { - filePath.setUrl(WebConstant.TEST_URL_BASE + filePath.getUrl()); +// filePath.setUrl(WebConstant.TEST_URL_BASE + filePath.getUrl()); + filePath.setUrl(PropUtil.imgDomain + "/" + filePath.getUrl()); } if (ObjectUtil.isNotNull(filePath.getUploaderId())) { //添加上传人的姓名信息 diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java index b5596ba3..5ee1fd30 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskPluginService.java @@ -8,7 +8,9 @@ import cn.hutool.core.util.StrUtil; import com.ccsens.tall.bean.dto.PluginDto; import com.ccsens.tall.bean.dto.WpsDto; import com.ccsens.tall.bean.po.*; +import com.ccsens.tall.bean.vo.MemberVo; import com.ccsens.tall.bean.vo.PluginVo; +import com.ccsens.tall.bean.vo.RoleVo; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.persist.dao.*; import com.ccsens.util.CodeEnum; @@ -817,4 +819,168 @@ public class TaskPluginService implements ITaskPluginService{ return personalTaskReport; } + + @Override + public List saveMinutesDay(Long currentUserId, PluginDto.GetMinutesDay getMinutesDay, String token) throws Exception { + + //查找该任务的会议记录文件，有则直接返回 + List minutesInfoList = new ArrayList<>(); + List wpsPath = wpsService.queryVisitUrls(getMinutesDay.getTaskId(),(byte) 2,token,null); + if(CollectionUtil.isNotEmpty(wpsPath)){ + minutesInfo(getMinutesDay.getTaskId(), minutesInfoList, wpsPath); + return minutesInfoList; + } + //之前没有会议记录则重新生成 + Workbook wb = new XSSFWorkbook(new FileInputStream(new File("/home/staticrec/minutesDay.xlsx"))); + //TODO 获取主持人、记录人、决策人、项目内的成员名、应到人数、项目下每个人的任务 + List> list = queryMinutesDay(getMinutesDay.getTaskId(),currentUserId); + PoiUtil.exportWB("会议纪要", list, wb); + //生成文件 + String name = "会议纪要"+DateUtil.today() + ".xlsx"; + String fileName = "minutesDay/" + DateUtil.today() + "/" + System.currentTimeMillis() + ".xlsx"; + File tmpFile = saveFile(wb, fileName); + //关联wps + saveWpsBusiness(currentUserId, getMinutesDay, name, fileName, tmpFile); + //获取wps文件的路径并返回 + wpsPath = wpsService.queryVisitUrls(getMinutesDay.getTaskId(),(byte) 2,token,null); + if(CollectionUtil.isNotEmpty(wpsPath)){ + minutesInfo(getMinutesDay.getTaskId(), minutesInfoList, wpsPath); + } + return minutesInfoList; + } + + private List> queryMinutesDay(Long taskId,Long userId) throws Exception { + ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskId); + if(ObjectUtil.isNull(taskDetail)) { + ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(taskId); + if (ObjectUtil.isNotNull(taskSubTime)) { + taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTime.getTaskDetailId()); + if(ObjectUtil.isNull(taskDetail)){ + throw new BaseException(CodeEnum.NOT_TASK); + } + }else { + throw new BaseException(CodeEnum.NOT_TASK); + } + } + //获取当前账号的名称，默认当前账号为主持人和记录人 + MemberVo.MemberInfo member = proMemberService.getProMemberByProjectIdAndUserId(taskDetail.getProjectId(), userId); + //获取当前项目内的成员人数和姓名 + List memberList = proMemberService.getAuthedMemberByProjectId(taskDetail.getProjectId()); + StringBuilder names = new StringBuilder(); + if(CollectionUtil.isNotEmpty(memberList)){ + for (int i = 0; i < memberList.size(); i++) { + MemberVo.MemberInfo proMember = memberList.get(i); + if(i != 0){ + names.append("、").append(proMember.getNickname()); + }else { + names.append(proMember.getNickname()); + } + } + } + + //生成写入数据 + List> list = new ArrayList<>(); + List title1 = new ArrayList<>(); + list.add(title1); + list.add(title1); + List value1 = new ArrayList<>(); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + if(ObjectUtil.isNotNull(member)){ + value1.add(new PoiUtil.PoiUtilCell(member.getNickname())); + }else { + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + } + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(names.toString())); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + value1.add(new PoiUtil.PoiUtilCell(memberList.size()+"")); + list.add(value1); + list.add(title1); + list.add(title1); + list.add(title1); + list.add(title1); + //TODO 获取所有角色和角色下当天的任务 + long thisDayStartTime = DateUtil.beginOfDay(new Date()).getTime(); + long thisDayEndTime = DateUtil.endOfDay(new Date()).getTime(); + List roleTaskList = roleDao.getRoleTaskByProjectId(taskDetail.getProjectId(),thisDayStartTime,thisDayEndTime); + if(CollectionUtil.isNotEmpty(roleTaskList)){ + roleTaskList.forEach(roleTask -> { + if(CollectionUtil.isNotEmpty(roleTask.getTaskList())){ + for (int i = 0; i < roleTask.getTaskList().size(); i++) { + RoleVo.RoleTaskInfo roleTaskInfo = roleTask.getTaskList().get(i); + List task = new ArrayList<>(); + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + if(i == 0){ + task.add(new PoiUtil.PoiUtilCell(roleTask.getRoleName(),1,roleTask.getTaskList().size())); + }else { + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + } + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + task.add(new PoiUtil.PoiUtilCell(roleTaskInfo.getTaskName())); + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + task.add(new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL)); + task.add(new PoiUtil.PoiUtilCell(roleTaskInfo.getCheckerName())); + list.add(task); + } + } + }); + } + return list; + } + + private File saveFile(Workbook wb, String fileName) throws IOException { + String path = PropUtil.path + File.separator + fileName; + File tmpFile = new File(path); + if (!tmpFile.getParentFile().exists()) { + tmpFile.getParentFile().mkdirs(); + } + OutputStream stream = new FileOutputStream(tmpFile); + wb.write(stream); + stream.close(); + return tmpFile; + } + + private void saveWpsBusiness(Long currentUserId, PluginDto.GetMinutesDay getMinutesDay, String name, String fileName, File tmpFile) { + WpsDto.Business business = new WpsDto.Business(); + business.setBusinessId(getMinutesDay.getTaskId()); + business.setBusinessType((byte) 2); + business.setUserId(currentUserId); + business.setFileName(name); + business.setFilePath(fileName); + business.setRealFilePath(PropUtil.path + File.separator + fileName); + business.setFileSize(tmpFile.length()); + business.setOperation(WebConstant.Wps.USER_OPERATION_NEW); + business.setPrivilege(WebConstant.Wps.PROJECT_PRIVILEGE_QUERY); + business.setPrivilegeQueryUrl(PropUtil.domain + "v1/3rd/wpsPower"); + wpsService.saveFile(business); + } + + private void minutesInfo(Long taskId, List minutesInfoList, List wpsPath) { + wpsPath.forEach(wps->{ + PluginVo.MinutesInfo minutesInfo = new PluginVo.MinutesInfo(); + minutesInfo.setWpsPath(wps); + //获取下载路径 + ProProjectFileExample projectFileExample = new ProProjectFileExample(); + projectFileExample.createCriteria().andBusinessIdEqualTo(taskId).andBusinessTypeEqualTo((byte) 2); + List projectFileList = proProjectFileDao.selectByExample(projectFileExample); + if(CollectionUtil.isNotEmpty(projectFileList)){ + WpsFile wpsFile = wpsFileDao.selectByPrimaryKey(projectFileList.get(0).getWpsFileId()); + minutesInfo.setDownloadPath(wpsFile.getDownloadUrl()); + minutesInfo.setWpsFileId(wpsFile.getId()); + } + minutesInfoList.add(minutesInfo); + }); + } } diff --git a/tall/src/main/java/com/ccsens/tall/web/PluginController.java b/tall/src/main/java/com/ccsens/tall/web/PluginController.java index 3d120009..fe28d920 100644 --- a/tall/src/main/java/com/ccsens/tall/web/PluginController.java +++ b/tall/src/main/java/com/ccsens/tall/web/PluginController.java @@ -208,4 +208,18 @@ public class PluginController { } + @ApiOperation(value = "每日会议纪要", notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value = "/minutesDay", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> saveMinutesDay(HttpServletRequest request, + @ApiParam @Validated @RequestBody PluginDto.GetMinutesDay getMinutesDay) throws Exception { + Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject()); + log.info("生成每日会议纪要：{}。useId:{}",getMinutesDay,currentUserId); + String authHeader = request.getHeader(WebConstant.HEADER_KEY_TOKEN); + String token = authHeader.substring(WebConstant.HEADER_KEY_TOKEN_PREFIX.length()); + List wpsPath = taskPluginService.saveMinutesDay(currentUserId,getMinutesDay,token); + log.info("生成每日会议纪要完成"); + return JsonResponse.newInstance().ok(wpsPath); + } } diff --git a/tall/src/main/resources/application-dev.yml b/tall/src/main/resources/application-dev.yml index ee0a41b5..8cb2dc85 100644 --- a/tall/src/main/resources/application-dev.yml +++ b/tall/src/main/resources/application-dev.yml @@ -12,9 +12,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: host: 192.168.0.99 - password: 111111 + password: guest port: 5672 - username: admin + username: guest redis: database: 0 host: 127.0.0.1 diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common diff --git a/tall/src/main/resources/mapper_dao/ProRoleDao.xml b/tall/src/main/resources/mapper_dao/ProRoleDao.xml index fbef8214..dedf8d4c 100644 --- a/tall/src/main/resources/mapper_dao/ProRoleDao.xml +++ b/tall/src/main/resources/mapper_dao/ProRoleDao.xml @@ -30,6 +30,17 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/SysProjectDao.xml b/tall/src/main/resources/mapper_dao/SysProjectDao.xml index f811ee10..cad47a89 100644 --- a/tall/src/main/resources/mapper_dao/SysProjectDao.xml +++ b/tall/src/main/resources/mapper_dao/SysProjectDao.xml @@ -125,6 +125,7 @@ s.name like concat('%',#{key},'%') AND s.rec_status = 0 + and a.rec_status = 0