Merge remote-tracking branch 'origin/master'

# Conflicts:
#	huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/FBoxSignalRConnection.java

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/controller/WeightController.java

@@ -19,9 +19,18 @@ public class WeightController {
     @Autowired
     private IWeight weight;
 
+    //保存日总重
     @RequestMapping(value = "/putDayWeight",method = RequestMethod.POST)
     public void putDayWeight(@RequestParam(value = "data",required = true) String data){
         //
         weight.saveDayWeight(data);
     }
+
+    //保存批次总重
+    @RequestMapping(value = "/putBatchWeight",method = RequestMethod.POST)
+    public void putBatchWeight(@RequestParam(value = "data",required = true) String data){
+        //
+        weight.saveBatchWeight(data);
+    }
+
 }

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/dao/entity/ProdBatchWeightEntity.java

@@ -0,0 +1,128 @@
+package com.huimv.receiver.farm.dao.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "prod_batch_weight")
+public class ProdBatchWeightEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "batch_code")
+    private String batchCode;
+
+    @Column(name = "batch_sort")
+    private Integer batchSort;
+
+    @Column(name = "gross_weight")
+    private Float grossWeight;
+
+    @Column(name = "tare_weight")
+    private Float tareWeight;
+
+    @Column(name = "net_weight")
+    private Float netWeight;
+
+    @Column(name = "trade_id")
+    private Integer tradeId;
+
+    @Column(name = "farm_id")
+    private Integer farmId;
+
+    @Column(name = "add_time")
+    private Timestamp addTime;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+    public String getBatchCode() {
+        return batchCode;
+    }
+
+    public void setBatchSort(Integer batchSort) {
+        this.batchSort = batchSort;
+    }
+
+    public Integer getBatchSort() {
+        return batchSort;
+    }
+
+    public void setGrossWeight(Float grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public Float getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setTareWeight(Float tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public Float getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setNetWeight(Float netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public Float getNetWeight() {
+        return netWeight;
+    }
+
+    public void setTradeId(Integer tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Integer getTradeId() {
+        return tradeId;
+    }
+
+    public void setFarmId(Integer farmId) {
+        this.farmId = farmId;
+    }
+
+    public Integer getFarmId() {
+        return farmId;
+    }
+
+    public void setAddTime(Timestamp addTime) {
+        this.addTime = addTime;
+    }
+
+    public Timestamp getAddTime() {
+        return addTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ProdBatchWeightEntity{" +
+                "id=" + id + '\'' +
+                "batchCode=" + batchCode + '\'' +
+                "batchSort=" + batchSort + '\'' +
+                "grossWeight=" + grossWeight + '\'' +
+                "tareWeight=" + tareWeight + '\'' +
+                "netWeight=" + netWeight + '\'' +
+                "tradeId=" + tradeId + '\'' +
+                "farmId=" + farmId + '\'' +
+                "addTime=" + addTime + '\'' +
+                '}';
+    }
+}

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/dao/repo/ProdBatchWeightRepo.java

@@ -0,0 +1,12 @@
+package com.huimv.receiver.farm.dao.repo;
+
+import com.huimv.receiver.farm.dao.entity.ProdBatchWeightEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+public interface ProdBatchWeightRepo extends JpaRepository<ProdBatchWeightEntity, Integer>, JpaSpecificationExecutor<ProdBatchWeightEntity> {
+
+    @Query(nativeQuery = true,value = "SELECT * FROM prod_batch_weight WHERE batch_code=?1")
+    ProdBatchWeightEntity findByBatchCode(String batchCode);
+}

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/service/IWeight.java

@@ -3,4 +3,7 @@ package com.huimv.receiver.farm.service;
 public interface IWeight {
     //
     void saveDayWeight(String data);
+
+    //
+    void saveBatchWeight(String data);
 }

huimv-farm-v2/huimv-center-receiver/src/main/java/com/huimv/receiver/farm/service/impl/WeightImpl.java

@@ -1,7 +1,9 @@
 package com.huimv.receiver.farm.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.huimv.receiver.farm.dao.entity.ProdBatchWeightEntity;
 import com.huimv.receiver.farm.dao.entity.ProdDayWeightEntity;
+import com.huimv.receiver.farm.dao.repo.ProdBatchWeightRepo;
 import com.huimv.receiver.farm.dao.repo.ProdDayWeightRepo;
 import com.huimv.receiver.farm.service.IWeight;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +24,19 @@ import java.util.Date;
 public class WeightImpl implements IWeight {
     @Autowired
     private ProdDayWeightRepo dayWeightRepo;
+    @Autowired
+    private ProdBatchWeightRepo batchWeightRepo;
 
+    /**
+     * @Method      : saveDayWeight
+     * @Description : 保存日总重数据
+     * @Params      : [data]
+     * @Return      : void
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/12/7       
+     * @Time        : 19:48
+     */
     @Override
     public void saveDayWeight(String data) {
         JSONObject dayWeightJo = JSONObject.parseObject(data);
@@ -32,7 +46,6 @@ public class WeightImpl implements IWeight {
         ProdDayWeightEntity existDayWeightEntity = dayWeightRepo.findByDateAndFarmId(new Date(date),farmId);
         if(existDayWeightEntity != null){
             existDayWeightEntity.setAddTime(new Timestamp(new Date().getTime()));
-//            existDayWeightEntity.setFarmId(dayWeightJo.getInteger("farmId"));
             existDayWeightEntity.setGrossWeight(dayWeightJo.getFloat("grossWeight"));
             existDayWeightEntity.setTareWeight(dayWeightJo.getFloat("tareWeight"));
             existDayWeightEntity.setNetWeight(dayWeightJo.getFloat("netWeight"));
@@ -48,4 +61,39 @@ public class WeightImpl implements IWeight {
         }
 
     }
+
+    /**
+     * @Method      : saveBatchWeight
+     * @Description : 保存批次重量数据
+     * @Params      : [data]
+     * @Return      : void
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/12/7       
+     * @Time        : 19:49
+     */
+    @Override
+    public void saveBatchWeight(String data) {
+        JSONObject batchWeightJo = JSONObject.parseObject(data);
+        String batchCode = batchWeightJo.getString("batchCode");
+        System.out.println("batchCode<<"+batchCode);
+        //查找批次称重数据
+        ProdBatchWeightEntity existBatchWeightEntity = batchWeightRepo.findByBatchCode(batchCode);
+        if(existBatchWeightEntity == null){
+            ProdBatchWeightEntity newBatchWeightEntity = new ProdBatchWeightEntity();
+            newBatchWeightEntity.setBatchCode(batchWeightJo.getString("batchCode"));
+            newBatchWeightEntity.setBatchSort(batchWeightJo.getInteger("batchSort"));
+            newBatchWeightEntity.setFarmId(batchWeightJo.getInteger("farmId"));
+            newBatchWeightEntity.setGrossWeight(batchWeightJo.getFloat("grossWeight"));
+            newBatchWeightEntity.setTareWeight(batchWeightJo.getFloat("tareWeight"));
+            newBatchWeightEntity.setNetWeight(batchWeightJo.getFloat("netWeight"));
+            newBatchWeightEntity.setAddTime(new Timestamp(new Date().getTime()));
+            batchWeightRepo.saveAndFlush(newBatchWeightEntity);
+        }else{
+            existBatchWeightEntity.setGrossWeight(batchWeightJo.getFloat("grossWeight"));
+            existBatchWeightEntity.setTareWeight(batchWeightJo.getFloat("tareWeight"));
+            existBatchWeightEntity.setNetWeight(batchWeightJo.getFloat("netWeight"));
+            batchWeightRepo.saveAndFlush(existBatchWeightEntity);
+        }
+    }
 }

huimv-farm-v2/huimv-gateway/pom.xml

@@ -18,11 +18,11 @@
     </properties>
 
     <dependencies>
-<!--        <dependency>-->
-<!--            <groupId>com.huimv</groupId>-->
-<!--            <artifactId>huimv-common</artifactId>-->
-<!--            <version>0.0.1-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>

huimv-farm-v2/huimv-gateway/src/main/resources/application-dev.yml

@@ -32,6 +32,12 @@ spring:
             - Path=/produce/**
           filters:
             - StripPrefix=1
+        - id: device
+          uri: http://127.0.0.1:10093
+          predicates:
+            - Path=/device/**
+          filters:
+            - StripPrefix=1
 
 logging:
   level:

huimv-farm-v2/huimv-pigfarm-local-device/.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/

huimv-farm-v2/huimv-pigfarm-local-device/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+            + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if (mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if (mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if (!outputFile.getParentFile().exists()) {
+            if (!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

huimv-farm-v2/huimv-pigfarm-local-device/.mvn/wrapper/maven-wrapper.properties

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

huimv-farm-v2/huimv-pigfarm-local-device/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 "$@"

huimv-farm-v2/huimv-pigfarm-local-device/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%

huimv-farm-v2/huimv-pigfarm-local-device/pom.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.6.0</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <groupId>com.huimv</groupId>
+    <artifactId>huimv-pigfarm-local-device</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>huimv-pigfarm-local-device</name>
+    <description>Demo project for Spring Boot</description>
+    <properties>
+        <java.version>1.8</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.huimv</groupId>
+            <artifactId>huimv-common</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- fastjson -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+        </dependency>
+        <!-- JPA -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.4</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/HuimvPigfarmLocalDeviceApplication.java

@@ -0,0 +1,13 @@
+package com.huimv.huimvpigfarmlocaldevice;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class HuimvPigfarmLocalDeviceApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(HuimvPigfarmLocalDeviceApplication.class, args);
+    }
+
+}

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/controller/DeviceController.java

@@ -0,0 +1,79 @@
+package com.huimv.huimvpigfarmlocaldevice.controller;
+
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.huimvpigfarmlocaldevice.dao.entity.FarmDeviceEntity;
+import com.huimv.huimvpigfarmlocaldevice.dao.repo.FarmDeviceRepo;
+import com.huimv.huimvpigfarmlocaldevice.service.IDevice;
+import com.huimv.huimvpigfarmlocaldevice.utils.DateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@CrossOrigin
+@RestController
+@RequestMapping(value = "/farm/device")
+@Slf4j
+public class DeviceController {
+    @Autowired
+    private IDevice iDevice;
+    @Autowired
+    private DateUtil dateUtil;
+
+    //新建设备信息
+    @RequestMapping(value = "/newDevice",method = RequestMethod.GET)
+    public Result saveDevice(@RequestParam(value = "deviceName",required = true) String deviceName,@RequestParam(value = "deviceCode",required = true) String deviceCode,@RequestParam(value = "deviceType",required = true) String deviceType,
+                             @RequestParam(value = "factory",required = true) String factory,@RequestParam(value = "worker",required = true) String worker,@RequestParam(value = "mainParams",required = true) String mainParams,
+                             @RequestParam(value = "state",required = true) Integer state, @RequestParam(value = "record",required = true) String record, @RequestParam(value = "farmId",required = true) Integer farmId){
+        //
+        return iDevice.newDevice(deviceName,deviceCode,deviceType,factory,worker,mainParams,state,record,farmId);
+    }
+
+    //编辑设备信息
+    @RequestMapping(value = "/editDevice",method = RequestMethod.GET)
+    public Result editDevice(@RequestParam(value = "deviceName",required = true) String deviceName,@RequestParam(value = "deviceCode",required = true) String deviceCode,@RequestParam(value = "deviceType",required = true) String deviceType,
+                             @RequestParam(value = "factory",required = true) String factory,@RequestParam(value = "worker",required = true) String worker,@RequestParam(value = "mainParams",required = true) String mainParams,
+                             @RequestParam(value = "state",required = true) Integer state, @RequestParam(value = "record",required = true) String record, @RequestParam(value = "farmId",required = true) Integer farmId,
+                             @RequestParam(value = "id",required = true) Integer id){
+            //
+        return iDevice.editDevice(deviceName,deviceCode,deviceType,factory,worker,mainParams,state,record,farmId,id);
+    }
+
+    //删除设备信息
+    @RequestMapping(value = "/removeDevice",method = RequestMethod.GET)
+    public Result removeDevice(@RequestParam(value = "ids",required = true) String ids,@RequestParam(value = "farmId",required = true) Integer farmId){
+        //
+        return iDevice.removeDevice(ids,farmId);
+    }
+
+    //列表展示设备
+    @RequestMapping(value = "/listDevice",method = RequestMethod.GET)
+    public Result listDevice(@RequestParam(value = "deviceName",required = false) String deviceName,@RequestParam(value = "deviceCode",required = false) String deviceCode,@RequestParam(value = "deviceType",required = false) String deviceType,
+                             @RequestParam(value = "factory",required = false) String factory,@RequestParam(value = "worker",required = false) String worker,
+                             @RequestParam(value = "state",required = false) Integer state, @RequestParam(value = "farmId",required = true) Integer farmId,
+                             @RequestParam(value = "startDate",required = false) String startDate,@RequestParam(value = "endDate",required = false) String endDate,
+                             @RequestParam(value = "pageNo",required = true) Integer pageNo, @RequestParam(value = "pageSize",required = true) Integer pageSize) throws ParseException {
+        //
+        return iDevice.listDevice(deviceName,deviceCode,deviceType,factory,worker,state,farmId,startDate,endDate,pageNo,pageSize);
+    }
+
+    //计算设备总数，设备故障数，故障率
+    @RequestMapping(value = "/getCountDeviceFailureRate",method = RequestMethod.GET)
+    public Result getCountDeviceFailureRate(@RequestParam(value = "farmId",required = true) Integer farmId,@RequestParam(value = "bit",required = true) Integer bit){
+        //
+        return iDevice.getCountDeviceFailureRate(farmId,bit);
+    }
+
+}

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/dao/entity/FarmDeviceEntity.java

@@ -0,0 +1,188 @@
+package com.huimv.huimvpigfarmlocaldevice.dao.entity;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "farm_device")
+public class FarmDeviceEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "device_name")
+    private String deviceName;
+
+    @Column(name = "device_code")
+    private String deviceCode;
+
+    @Column(name = "device_type")
+    private String deviceType;
+
+    @Column(name = "factory")
+    private String factory;
+
+    @Column(name = "worker")
+    private String worker;
+
+    @Column(name = "main_params")
+    private String mainParams;
+
+    @Column(name = "state")
+    private Integer state;
+
+    @Column(name = "record")
+    private String record;
+
+    @Column(name = "last_time")
+    private Timestamp lastTime;
+
+    @Column(name = "up_time")
+    private Timestamp upTime;
+
+    @Column(name = "down_time")
+    private Timestamp downTime;
+
+    @Column(name = "lockin_state")
+    private Integer lockinState;
+
+    @Column(name = "farm_id")
+    private Integer farmId;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setFactory(String factory) {
+        this.factory = factory;
+    }
+
+    public String getFactory() {
+        return factory;
+    }
+
+    public void setWorker(String worker) {
+        this.worker = worker;
+    }
+
+    public String getWorker() {
+        return worker;
+    }
+
+    public void setMainParams(String mainParams) {
+        this.mainParams = mainParams;
+    }
+
+    public String getMainParams() {
+        return mainParams;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setRecord(String record) {
+        this.record = record;
+    }
+
+    public String getRecord() {
+        return record;
+    }
+
+    public void setLastTime(Timestamp lastTime) {
+        this.lastTime = lastTime;
+    }
+
+    public Timestamp getLastTime() {
+        return lastTime;
+    }
+
+    public void setUpTime(Timestamp upTime) {
+        this.upTime = upTime;
+    }
+
+    public Timestamp getUpTime() {
+        return upTime;
+    }
+
+    public void setDownTime(Timestamp downTime) {
+        this.downTime = downTime;
+    }
+
+    public Timestamp getDownTime() {
+        return downTime;
+    }
+
+    public void setLockinState(Integer lockinState) {
+        this.lockinState = lockinState;
+    }
+
+    public Integer getLockinState() {
+        return lockinState;
+    }
+
+    public void setFarmId(Integer farmId) {
+        this.farmId = farmId;
+    }
+
+    public Integer getFarmId() {
+        return farmId;
+    }
+
+    @Override
+    public String toString() {
+        return "FarmDeviceEntity{" +
+                "id=" + id + '\'' +
+                "deviceName=" + deviceName + '\'' +
+                "deviceCode=" + deviceCode + '\'' +
+                "deviceType=" + deviceType + '\'' +
+                "factory=" + factory + '\'' +
+                "worker=" + worker + '\'' +
+                "mainParams=" + mainParams + '\'' +
+                "state=" + state + '\'' +
+                "record=" + record + '\'' +
+                "lastTime=" + lastTime + '\'' +
+                "upTime=" + upTime + '\'' +
+                "downTime=" + downTime + '\'' +
+                "lockinState=" + lockinState + '\'' +
+                "farmId=" + farmId + '\'' +
+                '}';
+    }
+}

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/dao/repo/FarmDeviceRepo.java

@@ -0,0 +1,19 @@
+package com.huimv.huimvpigfarmlocaldevice.dao.repo;
+
+import com.huimv.huimvpigfarmlocaldevice.dao.entity.FarmDeviceEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface FarmDeviceRepo extends JpaRepository<FarmDeviceEntity, Integer>, JpaSpecificationExecutor<FarmDeviceEntity> {
+
+    //
+    @Query(nativeQuery = true,value = "SELECT COUNT(*) AS total FROM farm_device WHERE farm_id=?1")
+    List<Object[]> findDeviceTotal(Integer farmId);
+
+    //
+    @Query(nativeQuery = true,value = "SELECT COUNT(*) AS num FROM farm_device WHERE farm_id=?1 AND state=?2")
+    List<Object[]> findFailureDeviceTotal(Integer farmId, Integer failureState);
+}

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/service/IDevice.java

@@ -0,0 +1,22 @@
+package com.huimv.huimvpigfarmlocaldevice.service;
+
+import com.huimv.common.utils.Result;
+
+import java.util.Date;
+
+public interface IDevice {
+    //
+    Result newDevice(String deviceName, String deviceCode, String deviceType, String factory, String worker, String mainParams, Integer state, String record, Integer farmId);
+
+    //
+    Result editDevice(String deviceName, String deviceCode, String deviceType, String factory, String worker, String mainParams, Integer state, String record, Integer farmId, Integer id);
+
+    //
+    Result removeDevice(String ids,Integer farmId);
+
+    //
+    Result listDevice(String deviceName, String deviceCode, String deviceType, String factory, String worker, Integer state, Integer farmId, String startDate, String endDate, Integer pageNo, Integer pageSize);
+
+    //
+    Result getCountDeviceFailureRate(Integer farmId, Integer bit);
+}

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/service/impl/DeviceImpl.java

@@ -0,0 +1,209 @@
+package com.huimv.huimvpigfarmlocaldevice.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.huimvpigfarmlocaldevice.dao.entity.FarmDeviceEntity;
+import com.huimv.huimvpigfarmlocaldevice.dao.repo.FarmDeviceRepo;
+import com.huimv.huimvpigfarmlocaldevice.service.IDevice;
+import com.huimv.huimvpigfarmlocaldevice.utils.DateUtil;
+import com.huimv.huimvpigfarmlocaldevice.utils.MathUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.*;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.*;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Service
+public class DeviceImpl implements IDevice {
+    @Autowired
+    private FarmDeviceRepo deviceRepo;
+    @Autowired
+    private DateUtil dateUtil;
+    @Autowired
+    private MathUtil mathUtil;
+
+    /**
+     * @Method : newDevice
+     * @Description : 添加设备
+     * @Params : [deviceName, deviceCode, deviceType, factory, worker, mainParams, state, record, farmId]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/8
+     * @Time : 22:03
+     */
+    @Override
+    public Result newDevice(String deviceName, String deviceCode, String deviceType, String factory, String worker, String mainParams, Integer state, String record, Integer farmId) {
+        FarmDeviceEntity deviceEntity = new FarmDeviceEntity();
+        deviceEntity.setDeviceCode(deviceCode);
+        deviceEntity.setDeviceName(deviceName);
+        deviceEntity.setDeviceType(deviceType);
+        deviceEntity.setFactory(factory);
+        deviceEntity.setFarmId(farmId);
+        deviceEntity.setMainParams(mainParams);
+        deviceEntity.setRecord(record);
+        deviceEntity.setWorker(worker);
+        deviceEntity.setState(state);
+        deviceEntity.setLastTime(new Timestamp(new Date().getTime()));
+        FarmDeviceEntity outFarmDeviceEntity = deviceRepo.saveAndFlush(deviceEntity);
+        return new Result(ResultCode.SUCCESS, outFarmDeviceEntity);
+    }
+
+    /**
+     * @Method : editDevice
+     * @Description : 编辑设备
+     * @Params : [deviceName, deviceCode, deviceType, factory, worker, mainParams, state, record, farmId, id]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/8
+     * @Time : 22:03
+     */
+    @Override
+    public Result editDevice(String deviceName, String deviceCode, String deviceType, String factory, String worker, String mainParams, Integer state, String record, Integer farmId, Integer id) {
+
+        Optional<FarmDeviceEntity> optional = deviceRepo.findById(id);
+        if (!optional.isPresent()) {
+            return new Result(10001, "该记录已不存在.", false);
+        }
+        FarmDeviceEntity deviceEntity = new FarmDeviceEntity();
+        deviceEntity.setId(id);
+        deviceEntity.setDeviceCode(deviceCode);
+        deviceEntity.setDeviceName(deviceName);
+        deviceEntity.setDeviceType(deviceType);
+        deviceEntity.setFactory(factory);
+        deviceEntity.setFarmId(farmId);
+        deviceEntity.setMainParams(mainParams);
+        deviceEntity.setRecord(record);
+        deviceEntity.setWorker(worker);
+        deviceEntity.setState(state);
+        deviceEntity.setLastTime(new Timestamp(new Date().getTime()));
+        FarmDeviceEntity outFarmDeviceEntity = deviceRepo.saveAndFlush(deviceEntity);
+        return new Result(ResultCode.SUCCESS, outFarmDeviceEntity);
+    }
+
+    /**
+     * @Method : removeDevice
+     * @Description : 删除设备
+     * @Params : [ids]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/8
+     * @Time : 22:02
+     */
+    @Override
+    public Result removeDevice(String ids, Integer farmId) {
+        String[] idArray = ids.split(",");
+        List idList = new ArrayList<>();
+        for (int a = 0; a < idArray.length; a++) {
+            idList.add(Integer.parseInt(idArray[a]));
+        }
+        deviceRepo.deleteAllByIdInBatch(idList);
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    /**
+     * @Method : listDevice
+     * @Description : 列表查询设备
+     * @Params : [deviceName, deviceCode, deviceType, factory, worker, state, farmId, startDate, endDate, pageNo, pageSize]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/8
+     * @Time : 22:02
+     */
+    @Override
+    public Result listDevice(String deviceName, String deviceCode, String deviceType, String factory, String worker, Integer state, Integer farmId, String startDateText, String endDateText, Integer pageNo, Integer pageSize) {
+        Specification<FarmDeviceEntity> sf = (Specification<FarmDeviceEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != farmId) {
+                predList.add(criteriaBuilder.equal(root.get("farmId").as(Integer.class), farmId));
+            }
+            if (null != deviceName) {
+                predList.add(criteriaBuilder.equal(root.get("deviceName").as(String.class), deviceName));
+            }
+            if (null != deviceCode) {
+                predList.add(criteriaBuilder.equal(root.get("deviceCode").as(String.class), deviceCode));
+            }
+            if (null != factory) {
+                predList.add(criteriaBuilder.equal(root.get("factory").as(String.class), factory));
+            }
+            if (null != worker) {
+                predList.add(criteriaBuilder.equal(root.get("worker").as(String.class), worker));
+            }
+            if (null != startDateText) {
+                Date startDate = dateUtil.parseDate(startDateText);
+                predList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("lastTime").as(Date.class), startDate));
+            }
+            if (null != endDateText) {
+                Date endDate = dateUtil.parseDatePlus(endDateText);
+                predList.add(criteriaBuilder.lessThanOrEqualTo(root.get("lastTime").as(Date.class), endDate));
+            }
+            if (null != state) {
+                predList.add(criteriaBuilder.equal(root.get("state").as(Integer.class), state));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
+        return new Result(ResultCode.SUCCESS, deviceRepo.findAll(sf, pageable));
+    }
+
+    /**
+     * @Method      : getCountDeviceFailureRate
+     * @Description : 计算设备故障率
+     * @Params      : [farmId, bit]
+     * @Return      : com.huimv.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/12/8
+     * @Time        : 23:51
+     */
+    @Override
+    public Result getCountDeviceFailureRate(Integer farmId, Integer bit) {
+        if (bit == null || bit == 0) {
+            bit = 2;
+        }
+        //获取设备总数
+        List<Object[]> objList = deviceRepo.findDeviceTotal(farmId);
+        Object[] totalObj = (Object[]) objList.get(0);
+        int total = Integer.parseInt(totalObj[0].toString());
+        //获取有故障设备数
+        Integer failureState = 2;
+        List<Object[]> failureList = deviceRepo.findFailureDeviceTotal(farmId, failureState);
+        Object[] failureObj = (Object[]) failureList.get(0);
+        int num = Integer.parseInt(failureObj[0].toString());
+        if (total == 0) {
+            return new Result(10002, "当前该牧场无任何设备.", false);
+        }
+        String rate = mathUtil.countRate(num, total, bit);
+        JSONObject outJo = new JSONObject();
+        outJo.put("total",total+" 个");
+        outJo.put("num",num+" 个");
+        outJo.put("rate",rate+" %");
+        return new Result(ResultCode.SUCCESS,outJo);
+    }
+
+
+}

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/utils/DateUtil.java

@@ -0,0 +1,321 @@
+package com.huimv.huimvpigfarmlocaldevice.utils;
+
+import cn.hutool.core.date.DateTime;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+@Slf4j
+public class DateUtil {
+    /**
+     * 获取今天
+     *
+     * @return String
+     */
+    public String getToday() {
+        return new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+    }
+
+    /**
+     * 获取昨天
+     *
+     * @return String
+     */
+    public String getYestoday() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DATE, -1);
+        Date time = cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+
+    /**
+     * 获取本月开始日期
+     *
+     * @return String
+     **/
+    public String getMonthStart() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.MONTH, 0);
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        Date time = cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+
+    /**
+     * 获取本月最后一天
+     *
+     * @return String
+     **/
+    public String getMonthEnd() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        Date time = cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+
+    /**
+     * 获取本周的第一天
+     *
+     * @return String
+     **/
+    public String getWeekStart() {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.WEEK_OF_MONTH, 0);
+        cal.set(Calendar.DAY_OF_WEEK, 2);
+        Date time = cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+
+    /**
+     * 获取本周的最后一天
+     *
+     * @return String
+     **/
+    public String getWeekEnd() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_WEEK, cal.getActualMaximum(Calendar.DAY_OF_WEEK));
+        cal.add(Calendar.DAY_OF_WEEK, 1);
+        Date time = cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+
+    /**
+     * 获取本年的第一天
+     *
+     * @return String
+     **/
+    public String getYearStart() {
+        return new SimpleDateFormat("yyyy").format(new Date()) + "-01-01";
+    }
+
+    /**
+     * 获取本年的最后一天
+     *
+     * @return String
+     **/
+    public String getYearEnd() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.MONTH, calendar.getActualMaximum(Calendar.MONTH));
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        Date currYearLast = calendar.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(currYearLast);
+    }
+
+    //Long转换为Date格式
+    public String fromLongToDate(Long time, String format) {
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        Date date = new Date(time);
+        return sdf.format(date);
+    }
+
+    public String formatTimestampToDatetime(Timestamp timestamp) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(timestamp);
+    }
+
+    public String formatTimestampToDate(Timestamp timestamp) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(timestamp);
+    }
+
+    //格式化本年
+    public String getThisYear() {
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        return String.valueOf(year);
+    }
+
+    //格式化本月
+    public String getThisMonth() {
+        Calendar cal = Calendar.getInstance();
+        int month = cal.get(Calendar.MONTH) + 1;
+        if (String.valueOf(month).length() == 1) {
+            return "0" + String.valueOf(month);
+        } else {
+            return String.valueOf(month);
+        }
+    }
+
+    //格式化日期时间
+    public String formatDateTime(String dateText) throws ParseException {
+        if (dateText.indexOf("T") != -1) {
+            dateText = dateText.replace("T", " ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = sdf.parse(dateText);
+        return sdf.format(date);
+    }
+
+    public String formatDateText(String dateText) throws ParseException {
+        if (dateText.indexOf("T") != -1) {
+            dateText = dateText.replace("T", " ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(dateText);
+        return sdf.format(date);
+    }
+
+    public String formatDateText(Date date) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(date);
+    }
+
+    public Date parseDateTime(String dateText) throws ParseException {
+        if (dateText.indexOf("T") != -1) {
+            dateText = dateText.replace("T", " ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.parse(dateText);
+    }
+
+    public Date parseDate(String dateText) {
+        if (dateText.indexOf("T") != -1) {
+            dateText = dateText.replace("T", " ");
+        }
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            return sdf.parse(dateText);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+
+    public Date parseDatePlus(String dateText) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar cd = Calendar.getInstance();
+            cd.setTime(sdf.parse(dateText));
+            cd.add(Calendar.DATE, 1);//增加一天
+            //cd.add(Calendar.MONTH, n);//增加一个月
+            return sdf.parse(sdf.format(cd.getTime()));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public Date parseDate2(String dateText) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.parse(dateText);
+    }
+
+    public Long parseDateTimeLong(String dateText) throws ParseException {
+        if (dateText.indexOf("T") != -1) {
+            dateText = dateText.replace("T", " ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = sdf.parse(dateText);
+        return date.getTime();
+    }
+
+
+    //
+    public Date getTodayDate() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.parse(sdf.format(new Date()));
+    }
+
+    public String getTodayDateText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(new Date());
+    }
+
+    public String getTodayText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(new Date());
+    }
+
+    public String getTodayMissionText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+        return sdf.format(new Date());
+    }
+
+    public String getStartDateInThisMonth() {
+        DateTime date = cn.hutool.core.date.DateUtil.date();
+        return (cn.hutool.core.date.DateUtil.beginOfMonth(date) + "").substring(0, 10);
+    }
+
+    public String getEndDateInThisMonth() {
+        DateTime date = cn.hutool.core.date.DateUtil.date();
+        return (date + "").substring(0, 10);
+    }
+
+    /**
+     * 获取过去或者未来 任意天内的日期数组
+     *
+     * @param intervals intervals天内
+     * @return 日期数组
+     */
+    public ArrayList<String> test(int intervals) {
+        ArrayList<String> pastDaysList = new ArrayList<>();
+        ArrayList<String> fetureDaysList = new ArrayList<>();
+        for (int i = 0; i < intervals; i++) {
+            pastDaysList.add(getPastDate(i));
+            fetureDaysList.add(getFetureDate(i));
+        }
+        return pastDaysList;
+    }
+
+    /**
+     * 获取过去第几天的日期
+     *
+     * @param past
+     * @return
+     */
+    public String getPastDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String result = format.format(today);
+        return result;
+    }
+
+    /**
+     * 获取未来 第 past 天的日期
+     *
+     * @param past
+     * @return
+     */
+    public String getFetureDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String result = format.format(today);
+        return result;
+    }
+
+    //重新构建日期
+    public String rebuildDateTime(String text) {
+        return text.substring(0, 4) + "-" + text.substring(4, 6) + "-" + text.substring(6, 8) + " " + text.substring(8, 10) + ":" + text.substring(10, 12) + ":" + text.substring(12, 14);
+    }
+
+    public static void main(String[] args) {
+        DateUtil du = new DateUtil();
+        //
+        du.test1();
+    }
+
+    private void test1() {
+        String text = "20211201104300";
+//        String text = "1234567890abcd";
+        String date = text.substring(0, 4) + "-" + text.substring(4, 6) + "-" + text.substring(6, 8) + " " + text.substring(8, 10) + ":" + text.substring(10, 12) + ":" + text.substring(12, 14);
+        System.out.println("date=" + date);
+    }
+}

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/utils/MathUtil.java

@@ -0,0 +1,68 @@
+package com.huimv.huimvpigfarmlocaldevice.utils;
+
+import org.springframework.stereotype.Component;
+
+import java.text.NumberFormat;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+public class MathUtil {
+
+    public String formatBit(float num, int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        return numberFormat.format(num);
+    }
+
+    public String formatBit(float num) {
+        return String.valueOf(num);
+    }
+
+    //计算比率
+    public String countRate(float num, int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        return numberFormat.format(num * 100);//所占百分比
+    }
+
+    //计算占比
+    public String countRate(float num, float total,int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        //所占百分比
+        return numberFormat.format((float)  num/ (float)total* 100);
+    }
+
+    //格式化
+    public String format(float num, int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        return numberFormat.format(num * 100);//所占百分比
+    }
+
+    //格式化
+    public String format(float num, float total,int bit) {
+        // 创建一个数值格式化对象
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        // 设置精确到小数点后2位
+        numberFormat.setMaximumFractionDigits(bit);
+        //所占百分比
+        return numberFormat.format((float)  num/ (float)total* 100);
+    }
+
+}

huimv-farm-v2/huimv-pigfarm-local-device/src/main/resources/application-dev.yml

@@ -0,0 +1,24 @@
+server:
+  port: 10093
+spring:
+  application:
+    name: huimv-farm-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://192.168.1.7:3306/huimv_farm_v2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+#    driver-class-name: com.mysql.jdbc.Driver
+#  jpa:
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+

huimv-farm-v2/huimv-pigfarm-local-device/src/main/resources/application-prod.yml

@@ -0,0 +1,24 @@
+server:
+  port: 10093
+spring:
+  application:
+    name: huimv-farm-device
+  #------DataSource-----
+  datasource:
+    url: jdbc:mysql://192.168.1.68:3308/huimv-farm-center?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+#    driver-class-name: com.mysql.jdbc.Driver
+#  jpa:
+#    hibernate:
+#      ddl-auto: update
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  jpa:
+    show-sql: true
+    database: mysql
+    hibernate:
+      ddl-auto: update
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    open-in-view: true
+

huimv-farm-v2/huimv-pigfarm-local-device/src/main/resources/application.properties

@@ -0,0 +1,9 @@
+spring.profiles.active=dev
+#spring.profiles.active=prod
+
+#ʱ¼ä¸ñʽÅäÖÃ
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+#spring.profiles.active=test
+
+

huimv-farm-v2/huimv-pigfarm-local-device/src/test/java/com/huimv/huimvpigfarmlocaldevice/HuimvPigfarmLocalDeviceApplicationTests.java

@@ -0,0 +1,13 @@
+package com.huimv.huimvpigfarmlocaldevice;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class HuimvPigfarmLocalDeviceApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}

huimv-farm-v2/huimv-produce-warning/pom.xml

@@ -58,7 +58,15 @@
             <artifactId>zhenzisms</artifactId>
             <version>2.0.2</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-jpa</artifactId>
+        </dependency>
+        <!-- JPA -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/controller/WeightController.java

@@ -2,6 +2,7 @@ package com.huimv.produce.controller;
 
 import com.huimv.common.utils.Result;
 import com.huimv.produce.service.IWeight;
+import com.huimv.produce.utils.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.ParseException;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -19,18 +22,101 @@ import org.springframework.web.bind.annotation.RestController;
  **/
 @CrossOrigin
 @RestController
-@RequestMapping(value = "/produce/weight")
+@RequestMapping(value = "/weight")
 @Slf4j
 public class WeightController {
     @Autowired
     private IWeight weight;
+    @Autowired
+    private DateUtil dateUtil;
+
+    //指定查询日期期间
+    @RequestMapping(value = "/getWeight")
+    public Result getDayWeight(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "startDate", required = true) String startDate, @RequestParam(value = "endDate", required = true) String endDate) {
+        log.info("farmId>>" + farmId);
+        log.info("startDate>>" + startDate);
+        log.info("endDate>>" + endDate);
+        //
+        return weight.getDayWeight(farmId, startDate, endDate);
+    }
+
+    //近7次卖猪数据
+    @RequestMapping(value = "/getWeightLastNtimes")
+    public Result getDayWeightLastNtimes(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "days", required = true) Integer days) {
+        log.info("farmId>>" + farmId);
+        log.info("days>>" + days);
+        //
+        return weight.getDayWeightLastNtimes(farmId, days);
+    }
+
+    //本月统计
+    @RequestMapping(value = "/getWeightInOneMonth")
+    public Result getDayWeightInOneMonth(@RequestParam(value = "farmId", required = true) Integer farmId) {
+        log.info("farmId>>" + farmId);
+        String startDateText = dateUtil.getMonthStart();
+        log.info("startDateText>>" + startDateText);
+        String endDateText = dateUtil.getMonthEnd();
+        log.info("endDateText>>" + endDateText);
+        //
+        return weight.getDayWeight(farmId, startDateText, endDateText);
+    }
+
+    //当天统计
+    @RequestMapping(value = "/getWeightOnToday")
+    public Result getDayWeightOnToday(@RequestParam(value = "farmId", required = true) Integer farmId) throws ParseException {
+        log.info("farmId>>" + farmId);
+        String todayDateText = dateUtil.getTodayDateText();
+        log.info("startDate>>" + todayDateText);
+        log.info("endDate>>" + todayDateText);
+        //
+        return weight.getDayWeight(farmId, todayDateText, todayDateText);
+    }
+
+    //查询所有记录带分页
+    @RequestMapping(value = "/getWeightOnPage")
+    public Result getWeightOnPage(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "pageSize", required = true) Integer pageSize,
+                                  @RequestParam(value = "pageNo", required = true) Integer pageNo) throws ParseException {
+        log.info("farmId>>" + farmId);
+        String startDate = dateUtil.getYearStart();
+        String endDate = dateUtil.getYearEnd();
+        log.info("startDate>>" + startDate);
+        log.info("endDate>>" + endDate);
+        log.info("pageNo>>" + pageNo);
+        log.info("pageSize>>" + pageSize);
+        //
+        return weight.getWeightOnPage(farmId, dateUtil.parseDate(startDate), dateUtil.parseDate(endDate), pageNo, pageSize);
+    }
+
+    //分页查询批次重量记录
+    @RequestMapping(value = "/getBatchWeightOnPage")
+    public Result getBatchWeightOnPage(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "pageSize", required = true) Integer pageSize,
+                                       @RequestParam(value = "pageNo", required = true) Integer pageNo,
+                                       @RequestParam(value = "addTime", required = false) String addTime) throws ParseException {
+        log.info("farmId>>" + farmId);
+        log.info("pageNo>>" + pageNo);
+        log.info("pageSize>>" + pageSize);
+        //
+        return weight.getBatchWeightOnPage(farmId, dateUtil.parseDate(addTime), pageNo, pageSize);
+    }
 
-    @RequestMapping(value = "/getDayWeight")
-    public Result getDayWeight(@RequestParam(value = "farmId",required = true) Integer farmId,@RequestParam(value = "startDate",required = false) String startDate,@RequestParam(value = "endDate",required = false) String endDate){
-        log.info("farmId>>"+farmId);
-        log.info("startDate>>"+startDate);
-        log.info("endDate>>"+endDate);
+    //分页查询批次重量记录
+    @RequestMapping(value = "/getBatchWeightOnPage2")
+    public Result getBatchWeightOnPage2(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "pageSize", required = true) Integer pageSize,
+                                        @RequestParam(value = "pageNo", required = true) Integer pageNo,
+                                        @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate) throws ParseException {
+        log.info("farmId>>" + farmId);
+        log.info("pageNo>>" + pageNo);
+        log.info("pageSize>>" + pageSize);
+        if(startDate == null){
+            startDate = dateUtil.getYearStart();
+        }
+        if(endDate == null){
+            endDate = dateUtil.getYearEnd();
+        }
+        log.info("startDate>>" + startDate);
+        log.info("endDate>>" + endDate);
         //
-        return weight.getDayWeight(farmId,startDate,endDate);
+        return weight.getBatchWeightOnPage2(farmId, dateUtil.parseDate(startDate),dateUtil.parseDate(endDate), pageNo, pageSize);
+//        return weight.getBatchWeightOnPage4(farmId, startDate,endDate, pageNo, pageSize);
     }
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/repo/ProdBatchWeightEntity.java

@@ -0,0 +1,128 @@
+package com.huimv.produce.repo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@Entity
+@Table(name = "prod_batch_weight")
+public class ProdBatchWeightEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Integer id;
+
+    @Column(name = "batch_code")
+    private String batchCode;
+
+    @Column(name = "batch_sort")
+    private Integer batchSort;
+
+    @Column(name = "gross_weight")
+    private Float grossWeight;
+
+    @Column(name = "tare_weight")
+    private Float tareWeight;
+
+    @Column(name = "net_weight")
+    private Float netWeight;
+
+    @Column(name = "trade_id")
+    private Integer tradeId;
+
+    @Column(name = "farm_id")
+    private Integer farmId;
+
+    @Column(name = "add_time")
+    private Timestamp addTime;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setBatchCode(String batchCode) {
+        this.batchCode = batchCode;
+    }
+
+    public String getBatchCode() {
+        return batchCode;
+    }
+
+    public void setBatchSort(Integer batchSort) {
+        this.batchSort = batchSort;
+    }
+
+    public Integer getBatchSort() {
+        return batchSort;
+    }
+
+    public void setGrossWeight(Float grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public Float getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setTareWeight(Float tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public Float getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setNetWeight(Float netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public Float getNetWeight() {
+        return netWeight;
+    }
+
+    public void setTradeId(Integer tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Integer getTradeId() {
+        return tradeId;
+    }
+
+    public void setFarmId(Integer farmId) {
+        this.farmId = farmId;
+    }
+
+    public Integer getFarmId() {
+        return farmId;
+    }
+
+    public void setAddTime(Timestamp addTime) {
+        this.addTime = addTime;
+    }
+
+    public Timestamp getAddTime() {
+        return addTime;
+    }
+
+    @Override
+    public String toString() {
+        return "ProdBatchWeightEntity{" +
+                "id=" + id + '\'' +
+                "batchCode=" + batchCode + '\'' +
+                "batchSort=" + batchSort + '\'' +
+                "grossWeight=" + grossWeight + '\'' +
+                "tareWeight=" + tareWeight + '\'' +
+                "netWeight=" + netWeight + '\'' +
+                "tradeId=" + tradeId + '\'' +
+                "farmId=" + farmId + '\'' +
+                "addTime=" + addTime + '\'' +
+                '}';
+    }
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/repo/ProdBatchWeightRepo.java

@@ -0,0 +1,16 @@
+package com.huimv.produce.repo;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.Date;
+
+public interface ProdBatchWeightRepo extends JpaRepository<ProdBatchWeightEntity, Integer>, JpaSpecificationExecutor<ProdBatchWeightEntity> {
+
+    @Query(nativeQuery = true,value = "SELECT * FROM prod_batch_weight WHERE farm_id=?1 AND DATE_FORMAT(add_time,'%Y-%m-%d')>=DATE_FORMAT(?2,'%Y-%m-%d') AND DATE_FORMAT(add_time,'%Y-%m-%d')<=DATE_FORMAT(?3,'%Y-%m-%d') ORDER BY id DESC",
+            countQuery = "SELECT COUNT(*) FROM prod_batch_weight WHERE farm_id=?1 AND DATE_FORMAT(add_time,'%Y-%m-%d')>=DATE_FORMAT(?2,'%Y-%m-%d') AND DATE_FORMAT(add_time,'%Y-%m-%d')<=DATE_FORMAT(?3,'%Y-%m-%d')")
+    Page<ProdBatchWeightEntity> findByFarmIdAndStartDateAndEndDate(Integer farmId, Date startDate, Date endDate, Pageable pageable);
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/repo/ProdDayWeightRepo.java

@@ -7,7 +7,11 @@ import org.springframework.data.jpa.repository.Query;
 import java.util.List;
 
 public interface ProdDayWeightRepo extends JpaRepository<ProdDayWeightEntity, Integer>, JpaSpecificationExecutor<ProdDayWeightEntity> {
-
+    //
     @Query(nativeQuery = true,value = "SELECT * FROM prod_day_weight WHERE farm_id=?1 AND DATE_FORMAT(add_time,'%Y-%m-%d') >= DATE_FORMAT(?2,'%Y-%m-%d') AND DATE_FORMAT(add_time,'%Y-%m-%d') <= DATE_FORMAT(?3,'%Y-%m-%d')")
     List<ProdDayWeightEntity> findByFarmIdAndStartAndEndDate(Integer farmId, String startDate, String endDate);
+
+    //
+    @Query(nativeQuery = true,value = "SELECT * FROM prod_day_weight WHERE farm_id=?1 ORDER BY id DESC LIMIT ?2")
+    List<ProdDayWeightEntity> findByFarmIdAndDays(Integer farmId, Integer days);
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/IWeight.java

@@ -2,6 +2,28 @@ package com.huimv.produce.service;
 
 import com.huimv.common.utils.Result;
 
+import java.text.ParseException;
+import java.util.Date;
+
 public interface IWeight {
+    //查询称重
     Result getDayWeight(Integer farmId, String startDate, String endDate);
+
+    //查询近几次卖猪记录
+    Result getDayWeightLastNtimes(Integer farmId, Integer days);
+
+    //分页查询称重记录
+    Result getWeightOnPage(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize);
+
+    //分页查询批次称重记录
+    Result getBatchWeightOnPage(Integer farmId, Date parseDate, Integer pageNo, Integer pageSize);
+
+    //分页查询批次称重记录
+    Result getBatchWeightOnPage(Integer farmId, Date parseDate, Date parseDate1, Integer pageNo, Integer pageSize) throws ParseException;
+
+    Result getBatchWeightOnPage2(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize) throws ParseException;
+
+    Result getBatchWeightOnPage3(Integer farmId, Date parseDate, Date parseDate1, Integer pageNo, Integer pageSize);
+
+    Result getBatchWeightOnPage4(Integer farmId, String startDate, String endDate, Integer pageNo, Integer pageSize);
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/WeightImpl.java

@@ -1,14 +1,28 @@
 package com.huimv.produce.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.produce.repo.ProdBatchWeightEntity;
+import com.huimv.produce.repo.ProdBatchWeightRepo;
 import com.huimv.produce.repo.ProdDayWeightEntity;
 import com.huimv.produce.repo.ProdDayWeightRepo;
 import com.huimv.produce.service.IWeight;
+import com.huimv.produce.utils.DateUtil;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.*;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.criteria.*;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.*;
 
 /**
  * @Project : huimv.shiwan
@@ -22,15 +36,297 @@ import java.util.List;
 public class WeightImpl implements IWeight {
     @Autowired
     private ProdDayWeightRepo dayWeightRepo;
+    @Autowired
+    private ProdBatchWeightRepo batchWeightRepo;
+    @Autowired
+    private DateUtil dateUtil;
+
+    /**
+     * @Method : getDayWeight
+     * @Description :
+     * @Params : [farmId, startDate, endDate]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/7
+     * @Time : 13:58
+     */
+    @Override
+    public Result getDayWeight(Integer farmId, String startDate, String endDate) {
+        //
+        List<ProdDayWeightEntity> dayWeightEntityList = dayWeightRepo.findByFarmIdAndStartAndEndDate(farmId, startDate, endDate);
+        if (dayWeightEntityList.size() > 0) {
+            BigDecimal totalBd = new BigDecimal(0);
+            for (int a = 0; a < dayWeightEntityList.size(); a++) {
+                ProdDayWeightEntity dayWeightEntity = dayWeightEntityList.get(a);
+                totalBd = new BigDecimal(dayWeightEntity.getNetWeight()).add(totalBd);
+            }
+            JSONObject outJo = new JSONObject();
+            outJo.put("total", totalBd.toString());
+            outJo.put("weight", dayWeightEntityList);
+            return new Result(ResultCode.SUCCESS, outJo);
+        } else {
+            return new Result(10001, "暂无数据.", false);
+        }
+    }
 
+    /**
+     * @Method : getDayWeightLastNtimes
+     * @Description :
+     * @Params : [farmId, days]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/7
+     * @Time : 13:58
+     */
     @Override
-    public Result getDayWeight(Integer farmId, String startDate, String endDate){
+    public Result getDayWeightLastNtimes(Integer farmId, Integer days) {
         //
-        List<ProdDayWeightEntity> dayWeightEntityList = dayWeightRepo.findByFarmIdAndStartAndEndDate(farmId,startDate,endDate);
-        if(dayWeightEntityList.size()>0){
-            return new Result(ResultCode.SUCCESS,dayWeightEntityList);
-        }else{
-            return new Result(10001,"暂无数据.",false);
+        List<ProdDayWeightEntity> dayWeightEntityList = dayWeightRepo.findByFarmIdAndDays(farmId, days);
+        if (dayWeightEntityList.size() > 0) {
+            //排序
+            List outList = new ArrayList();
+            for (int a = dayWeightEntityList.size() - 1; a >= 0; a--) {
+                outList.add(dayWeightEntityList.get(a));
+            }
+            //计算总重
+            BigDecimal totalBd = new BigDecimal(0);
+            for (int a = 0; a < dayWeightEntityList.size(); a++) {
+                ProdDayWeightEntity dayWeightEntity = dayWeightEntityList.get(a);
+                totalBd = new BigDecimal(dayWeightEntity.getNetWeight()).add(totalBd);
+            }
+            JSONObject outJo = new JSONObject();
+            outJo.put("total", totalBd.toString());
+            outJo.put("weight", outList);
+            return new Result(ResultCode.SUCCESS, outJo);
+        } else {
+            return new Result(10001, "暂无数据.", false);
+        }
+    }
+
+    /**
+     * @Method : getWeightOnPage
+     * @Description : 分页查询称重记录
+     * @Params : [farmId, startDate, endDate, pageNo, pageSize]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/7
+     * @Time : 14:56
+     */
+    @Override
+    public Result getWeightOnPage(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize) {
+        Specification<ProdDayWeightEntity> sf = (Specification<ProdDayWeightEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != farmId) {
+                predList.add(criteriaBuilder.equal(root.get("farmId").as(Integer.class), farmId));
+            }
+            if (null != startDate) {
+                predList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("addTime").as(Date.class), startDate));
+            }
+            if (null != endDate) {
+                predList.add(criteriaBuilder.lessThanOrEqualTo(root.get("addTime").as(Date.class), endDate));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
+//        return new Result(ResultCode.SUCCESS,applyRepo.listApply(pageable,applyId));
+        return new Result(ResultCode.SUCCESS, dayWeightRepo.findAll(sf, pageable));
+    }
+
+    /**
+     * @Method : getBatchWeightOnPage
+     * @Description : 分页查询批次重量记录
+     * @Params : [farmId, addTime, pageNo, pageSize]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/7
+     * @Time : 20:31
+     */
+    @Override
+    public Result getBatchWeightOnPage(Integer farmId, Date addTime, Integer pageNo, Integer pageSize) {
+        Specification<ProdBatchWeightEntity> sf = (Specification<ProdBatchWeightEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != farmId) {
+                predList.add(criteriaBuilder.equal(root.get("farmId").as(Integer.class), farmId));
+            }
+            if (null != addTime) {
+                predList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("addTime").as(Date.class), addTime));
+            }
+            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
+        return new Result(ResultCode.SUCCESS, batchWeightRepo.findAll(sf, pageable));
+    }
+
+    /**
+     * @Method : getBatchWeightOnPage
+     * @Description :
+     * @Params : [farmId, startDate, endDate, pageNo, pageSize]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/7
+     * @Time : 20:36
+     */
+    @Override
+    public Result getBatchWeightOnPage(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize) throws ParseException {
+        System.out.println("startDate 2>>" + startDate + " " + dateUtil.formatDateText(startDate));
+        System.out.println("endDate 2>>" + endDate + " " + dateUtil.formatDateText(endDate));
+        Specification<ProdBatchWeightEntity> sf = (Specification<ProdBatchWeightEntity>) (root, criteriaQuery, criteriaBuilder) -> {
+            //
+            List<Predicate> predList = new ArrayList<>();
+            if (null != farmId) {
+                predList.add(criteriaBuilder.equal(root.get("farmId").as(Integer.class), farmId));
+            }
+            if (null != startDate) {
+                predList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("addTime").as(Date.class), startDate));
+            }
+            if (null != endDate) {
+                predList.add(criteriaBuilder.lessThanOrEqualTo(root.get("addTime").as(Date.class), endDate));
+            }
+//            //
+            Predicate[] pred = new Predicate[predList.size()];
+            Predicate and = criteriaBuilder.and(predList.toArray(pred));
+            criteriaQuery.where(and);
+            //
+            List<Order> orders = new ArrayList<>();
+            orders.add(criteriaBuilder.desc(root.get("id")));
+            return criteriaQuery.orderBy(orders).getRestriction();
+        };
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
+        return new Result(ResultCode.SUCCESS, batchWeightRepo.findAll(sf, pageable));
+    }
+
+    /**
+     * @Method : getBatchWeightOnPage2
+     * @Description :
+     * @Params : [farmId, startDate, endDate, pageNo, pageSize]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2021/12/8
+     * @Time : 10:43
+     */
+    @Override
+    public Result getBatchWeightOnPage2(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize) throws ParseException {
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.Direction.DESC, "id");
+        //
+        return new Result(ResultCode.SUCCESS, batchWeightRepo.findByFarmIdAndStartDateAndEndDate(farmId, startDate, endDate, pageable));
+    }
+
+    @PersistenceContext
+    EntityManager entityManager;
+
+    @Override
+    public Result getBatchWeightOnPage3(Integer farmId, Date startDate, Date endDate, Integer pageNo, Integer pageSize) {
+        StringBuilder countSelectSql = new StringBuilder();
+        countSelectSql.append("select count(*) from ProdBatchWeightEntity bw where 1=1 ");
+
+        StringBuilder selectSql = new StringBuilder();
+        selectSql.append("from ProdBatchWeightEntity bw where 1=1 ");
+
+        Map<String, Object> params = new HashMap<>();
+        StringBuilder whereSql = new StringBuilder();
+        //farmId
+        if (farmId != null) {
+            whereSql.append(" and farmId=:farmId ");
+            params.put("farmId", farmId);
+        }
+        //startDate
+        if(startDate != null){
+            whereSql.append(" and addTime>=:startDate ");
+            params.put("startDate", startDate);
         }
+        //endDate
+        if(endDate != null){
+            whereSql.append(" and addTime<=:endDate ");
+            params.put("endDate", endDate);
+        }
+        //加入排序顺序
+        whereSql.append(" ORDER BY id DESC");
+        String countSql = new StringBuilder().append(countSelectSql).append(whereSql).toString();
+        Query countQuery = this.entityManager.createQuery(countSql, Long.class);
+        this.setParameters(countQuery, params);
+        Long count = (Long) countQuery.getSingleResult();
+
+        String querySql = new StringBuilder().append(selectSql).append(whereSql).toString();
+        Query query = this.entityManager.createQuery(querySql, ProdBatchWeightEntity.class);
+        this.setParameters(query, params);
+        query.setFirstResult((pageNo - 1) * pageSize);
+        query.setMaxResults(pageSize);
+        List<ProdBatchWeightEntity> batchWeightList = query.getResultList();
+
+//        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.Direction.DESC, "id");
+        Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
+        Page<ProdBatchWeightEntity> incomeDailyPage = new PageImpl<ProdBatchWeightEntity>(batchWeightList, pageable, count);
+
+        return new Result(ResultCode.SUCCESS, incomeDailyPage);
+    }
+
+    private void setParameters(Query query, Map<String, Object> params) {
+        for (Map.Entry<String, Object> entry : params.entrySet()) {
+            query.setParameter(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @Override
+    public Result getBatchWeightOnPage4(Integer farmId, String startDate, String endDate, Integer pageNo, Integer pageSize) {
+        StringBuilder countSelectSql = new StringBuilder();
+        countSelectSql.append("select count(*) from prod_batch_weight bw where 1=1 ");
+
+        StringBuilder selectSql = new StringBuilder();
+        selectSql.append("from prod_batch_weight bw where 1=1 ");
+
+        Map<String, Object> params = new HashMap<>();
+        StringBuilder whereSql = new StringBuilder();
+        //farmId
+        if (farmId != null) {
+            whereSql.append(" AND farm_id= :farmId");
+            params.put("farmId", farmId);
+        }
+        //startDate
+        if(startDate != null){
+            whereSql.append(" AND date_format(add_time,'%Y-%m-%d')>= :startDate ");
+            params.put("startDate", startDate);
+        }
+        //endDate
+        if(endDate != null){
+            whereSql.append(" AND date_format(add_time,'%Y-%m-%d')<= :endDate");
+            params.put("endDate", endDate);
+        }
+        //加入排序顺序
+        whereSql.append(" ORDER BY id DESC");
+        String countSql = new StringBuilder().append(countSelectSql).append(whereSql).toString();
+        Query countQuery = this.entityManager.createNativeQuery(countSql);
+        this.setParameters(countQuery, params);
+//        Long count = (Long) countQuery.getSingleResult();
+        int size = countQuery.getResultList().size();
+//        System.out.println("count>>"+count);
+        System.out.println("size>>"+size);
+
+        String querySql = new StringBuilder().append(selectSql).append(whereSql).toString();
+        Query query = this.entityManager.createNativeQuery(querySql);
+        this.setParameters(query, params);
+        query.setFirstResult((pageNo - 1) * pageSize);
+        query.setMaxResults(pageSize);
+        List<ProdBatchWeightEntity> batchWeightList = query.getResultList();
+//        Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.Direction.DESC, "id");
+//        Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
+//        Page<ProdBatchWeightEntity> incomeDailyPage = new PageImpl<ProdBatchWeightEntity>(batchWeightList, pageable);
+
+        return new Result(ResultCode.SUCCESS, batchWeightList);
     }
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/FBoxSignalRConnection.java

@@ -1,161 +0,0 @@
-package com.huimv.produce.sgd;
-
-import com.github.signalr4j.client.hubs.HubProxy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.huimv.produce.sgd.fbox.Logger;
-import com.huimv.produce.sgd.fbox.LoggerFactory;
-import com.huimv.produce.sgd.fbox.TokenManager;
-import com.huimv.produce.sgd.fbox.signalr.SignalRConnectionBase;
-import java.net.Proxy;
-import java.text.SimpleDateFormat;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.LongAdder;
-
-
-public class FBoxSignalRConnection extends SignalRConnectionBase {
-    private final Gson gson;
-    private final Logger logger;
-    ConcurrentHashMap<Long, LongAdder> dmonIds = new ConcurrentHashMap<>();
-    private LongAdder dmonMsgCounter = new LongAdder();
-    private long lastDmonItemCount;
-    private long lastDmonMsgCount;
-    private long lastReportTime;
-    private Proxy proxy;
-    private LongAdder dmonItemCounter = new LongAdder();
-
-    public FBoxSignalRConnection(String hubUrl, String signalrClientId, TokenManager tokenManager, Proxy proxy, LoggerFactory loggerFactory) {
-        super(hubUrl, signalrClientId, tokenManager, proxy, loggerFactory);
-        this.logger = loggerFactory.createLogger("FBoxSignalRConnection");
-        this.proxy = proxy;
-        gson = new GsonBuilder().create();
-//        new Thread(() -> {
-//            //统计条目数线程,可以去掉此线程代码
-//            for (; ; ) {
-//                try {
-//                    Thread.sleep(5000);
-//                } catch (InterruptedException e) {
-//                    e.printStackTrace();
-//                }
-//                long currentTime = System.nanoTime();
-//                long currentMsgCount = this.dmonMsgCounter.longValue();
-//                long currentItemCount = this.dmonItemCounter.longValue();
-//                long msgRate = (currentMsgCount - this.lastDmonMsgCount) * 1000000000 / (currentTime - this.lastReportTime);
-//                long itemRate = (currentItemCount - this.lastDmonItemCount) * 1000000000 / (currentTime - this.lastReportTime);
-//                this.logger.logInformation(String.format("Dmon id count: %d, item rate: %d, message rate: %d", this.dmonIds.size(), itemRate, msgRate));
-//                this.lastReportTime = currentTime;
-//                this.lastDmonMsgCount = currentMsgCount;
-//                this.lastDmonItemCount = currentItemCount;
-//            }
-//        }).start();
-    }
-
-    @Override
-    public void connected() {
-        super.connected();
-        dmonIds.clear();
-    }
-
-
-    @Override
-    protected void onHubProxyDestroyed(HubProxy hubProxy){
-        hubProxy.removeSubscription("dMonUpdateValue");
-        hubProxy.removeSubscription("alarmTriggered");
-        hubProxy.removeSubscription("alarmRecovered");
-        hubProxy.removeSubscription("boxConnStateChanged");
-    }
-
-    SimpleDateFormat sdf  = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
-    @Override
-    protected void onHubProxyCreated(HubProxy hubProxy) {
-        //signalr实时数据推送事件，接收此事件数据前提条件，开启监控点数据推送控制接口（订阅）
-        hubProxy.subscribe("dMonUpdateValue").addReceivedHandler(jsonElements -> {
-            Global.threadPool.submit(() -> {
-                //try{
-                    this.dmonMsgCounter.increment();
-                    //System.out.println("Dmon data received: ");
-                    //收到的推送数据
-                    JsonArray items = jsonElements[1].getAsJsonArray();
-                    for (com.google.gson.JsonElement jsonElement : items) {
-                        JsonObject item = jsonElement.getAsJsonObject();
-                        this.dmonIds.computeIfAbsent(item.get("id").getAsLong(), aLong -> new LongAdder()).increment();
-                        this.dmonItemCounter.increment();
-                        //收到的推送数据
-                        String name = item.get("name").getAsString();
-                        String value = item.get("value").getAsString();
-                        long time = item.get("t").getAsLong();
-                        this.logger.logInformation(String.format(" %s, %s, %d\n",name,value,time));
-                        //监控点正常无status属性
-                        //long statu = item.get("status").getAsLong();
-                    };
-                    //打印监控点的值集合，集合详细信息请看接口文档http://docs.flexem.net/fbox/zh-cn/tutorials/RealtimeDataPush.html
-                    System.out.printf("%s",jsonElements[1].getAsJsonArray());
-                    //打印boxUid
-                    System.out.printf("%s",jsonElements[2].getAsLong());
-//                }
-//                catch (Exception e) {
-//                    System.out.printf("%s", e);
-//                }
-            });
-        });
-
-        // signalr报警触发事件
-//        hubProxy.subscribe("alarmTriggered").addReceivedHandler(jsonElements -> {
-//            Global.threadPool.submit(() -> {
-//                System.out.println("Alarm triggered: ");
-//                for (com.google.gson.JsonElement jsonElement : jsonElements) {
-//                    //报警推送消息全部打印。具体参数解释请看接口文档http://docs.flexem.net/fbox/zh-cn/tutorials/AlarmTiggerPush.html
-//                    System.out.println("\t" + jsonElement);
-//                };
-//                //打印报警条目的值集合
-//                System.out.printf("%s",jsonElements[1].getAsJsonArray());
-//                //打印boxUid
-//                System.out.printf("%s",jsonElements[2].getAsLong());
-//            });
-//        });
-
-        // signalr报警还原事件
-//        hubProxy.subscribe("alarmRecovered").addReceivedHandler(jsonElements -> {
-//            Global.threadPool.submit(() -> {
-//                System.out.println("Alarm recovered: ");
-//                for (com.google.gson.JsonElement jsonElement : jsonElements) {
-//                    //报警推送消息全部打印。具体参数解释请看接口文档http://docs.flexem.net/fbox/zh-cn/tutorials/AlarmReductionPush.html
-//                    System.out.println("\t" + jsonElement);
-//                };
-//                //打印报警条目的值集合
-//                System.out.printf("%s",jsonElements[1].getAsJsonArray());
-//                //打印boxUid
-//                System.out.printf("%s",jsonElements[2].getAsLong());
-//            });
-//        });
-
-        // signalr盒子状态变更事件
-//        hubProxy.subscribe("boxConnStateChanged").addReceivedHandler(jsonElements -> {
-//            Global.threadPool.submit(() -> {
-//                System.out.println("Box state changed.");
-//                if (jsonElements.length <= 0)
-//                    return;
-//                BoxStateChanged[] stateChanges = gson.fromJson(jsonElements[0], BoxStateChanged[].class);
-//                this.logger.logInformation(String.format("receive count: %d", stateChanges.length));
-//                for (BoxStateChanged stateChange : stateChanges) {
-//                    // stateChange.id 是盒子列表中BoxReg对象下的box.id，可以根据这个过滤要开的盒子。
-//                    // stateChange.state 为1、2是盒子上线事件。实时数据推送需要开点
-//                    if (stateChange.state == 1 || stateChange.state == 2) {
-//                            try {
-//                                // 盒子每次上线后，均需要开启FBox数据推送控制接口（订阅）
-//                                Global.commServer.executePost("box/" + stateChange.id + "/dmon/start", String.class);
-//                                // token有效期为两小时。若token过期，demo会自动刷新token。所以返回401后均需要重试接口
-//                                this.logger.logInformation(String.format("Start dmon points on box ok %s\n",stateChange.id));
-//                            } catch (IOException e) {
-//                                System.out.println(e);
-//                                e.printStackTrace();
-//                            }
-//                    }
-//                }
-//
-//            });
-//        });
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/Global.java

@@ -1,45 +0,0 @@
-package com.huimv.produce.sgd;
-
-
-import com.huimv.produce.sgd.fbox.ServerCaller;
-
-import java.net.Proxy;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class Global {
-    public static Proxy proxy = null;
-//    配置流量过Fiddler代理
-//    public static Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8888));
-    public static ExecutorService threadPool = Executors.newCachedThreadPool();
-    public static ServerCaller commServer;
-    public static ServerCaller appServer;
-    public static ServerCaller hdataServer;
-    public static ServerCaller apiBaseServer;
-
-    // 以下服务器地址是繁易公有云，私有云请根据实际情况修改
-//    public static final String idServerUrl = "https://account.flexem.com/core/";
-//    public static String appServerApiUrl = "http://fbox360.com/api/client/";
-//    public static final String commServerApiUrl = "http://fbcs101.fbox360.com/api/";
-//    public static final String commServerSignalRUrl = "http://fbcs101.fbox360.com/push";
-//    public static String hdataServerApiUrl = "http://fbhs1.fbox360.com/api/";
-
-    public static final String idServerUrl = "http://account.highgerman.cn/core/";
-    public static String appServerApiUrl = "http://cloud.highgerman.cn/";
-    public static final String commServerApiUrl = "http://cs.highgerman.cn/api/";
-    public static final String commServerSignalRUrl = "http://cs.highgerman.cn/push";
-    public static String hdataServerApiUrl = "http://hs.highgerman.cn/api/";
-    public static String apiBaserUrl = "http://cs.highgerman.cn/api";
-    public static String signalrClientId = UUID.randomUUID().toString();
-
-
-    //FlexManager注册的账号
-    public static String username = "sgdsgd103";
-    public static String password = "sgdsgd123";
-    // 获取API账号请咨询对接的销售。
-    public static String clientId = "fboxsdkcc";
-    public static String clientSecret = "6f556f31d524498baa0fc8c8bcb99285";
-
-
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/Main.java

@@ -1,215 +0,0 @@
-package com.huimv.produce.sgd;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONUtil;
-import com.huimv.produce.sgd.entity.Item;
-import com.huimv.produce.sgd.entity.Monitory;
-import com.huimv.produce.sgd.entity.MonitoryGetArgs;
-import com.huimv.produce.sgd.entity.MonitoryValue;
-import com.huimv.produce.sgd.fbox.ConsoleLoggerFactory;
-import com.huimv.produce.sgd.fbox.ServerCaller;
-import com.huimv.produce.sgd.fbox.StaticCredentialProvider;
-import com.huimv.produce.sgd.fbox.TokenManager;
-import com.huimv.produce.sgd.fbox.models.BoxGroup;
-import com.huimv.produce.sgd.fbox.models.BoxReg;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class Main {
-    private static final long SLEEP_TIME = 1000;
-
-    public static void main(String[] args) throws IOException, InterruptedException {
-        ConsoleLoggerFactory loggerFactory = new ConsoleLoggerFactory();
-        // 指定连接服务器的凭据参数
-        TokenManager tokenManager = new TokenManager(new StaticCredentialProvider(Global.clientId, Global.clientSecret, Global.username, Global.password), Global.idServerUrl, loggerFactory);
-        ServerCaller appServer = new ServerCaller(tokenManager, Global.appServerApiUrl, Global.signalrClientId, loggerFactory);
-        ServerCaller apiBaseServer = new ServerCaller(tokenManager, Global.apiBaserUrl, Global.signalrClientId, loggerFactory);
-        Global.appServer = appServer;
-        Global.apiBaseServer = apiBaseServer;
-
-        BoxGroup[] boxGroups = appServer.executeGet("api/client/box/grouped", BoxGroup[].class);
-        // 返回的是 盒子分组-盒子注册项（BoxReg） 的二层结构
-        List<Map> list = new ArrayList();
-        for (BoxGroup group : boxGroups) {
-            //盒子
-            for (BoxReg boxReg : group.boxRegs) {
-                if (boxReg.alias.contains("环控")){
-                    Monitory[] monitories = apiBaseServer.executeGet("/v2/box/" + boxReg.boxUid + "/dmon/grouped", Monitory[].class);
-                    //每个监控点
-                    List<Map> groupnames = new ArrayList();
-                    for (Monitory monitory : monitories) {
-//                        System.out.println("监控点------------->" + monitory.toString());
-                       List names = new ArrayList();
-                        for (Item item : monitory.items) {
-                            String name = item.name;
-                            if ( monitory.name.contains("每个房间") && name != null ) {
-                                if (name.contains("平均温度") || name.contains("湿度") ||name.contains("日用水量") ||name.contains("月用水量")  ) {
-                                    names.add(name);
-                                }
-                            }
-
-                        }
-                                              Map map = new HashMap();
-
-                        if (ObjectUtil.isNotEmpty(names)) {
-                            MonitoryValue[] monitoryValues = apiBaseServer.executePost("/v2/box/" + boxReg.boxUid + "/dmon/value/get", new MonitoryGetArgs(names, null, new ArrayList()), MonitoryValue[].class);
-                            StringBuilder str = new StringBuilder();
-                            for (MonitoryValue monitoryValue : monitoryValues) {
-                                if (ObjectUtil.isNotEmpty(monitory)) {
-                                    str.append(JSONUtil.toJsonStr(monitoryValue));
-                                }
-
-                            }
-                            map.put("monitoryValues", str);
-                            map.put("grpName", monitory.name);
-//                        map.put("names",names);
-                            groupnames.add(map);
-                        }
-                    }
-
-                    if (ObjectUtil.isNotEmpty(groupnames)){
-                        Map map = new HashMap();
-                        map.put("name",boxReg.alias);
-                        map.put("groupnames",groupnames);
-
-                        list.add(map);
-                    }
-                }
-            }
-        }
-
-        for (Map map : list) {
-            System.out.println(map.get("name")+"----->"+map.get("groupnames"));
-        }
-
-
-    }
-
-
-
-
-   /* private static final long SLEEP_TIME = 3000;
-    public static void main(String[] args) {
-
-        ConsoleLoggerFactory loggerFactory = new ConsoleLoggerFactory();
-
-        // 指定连接服务器的凭据参数
-        TokenManager tokenManager = new TokenManager(new StaticCredentialProvider(Global.clientId, Global.clientSecret, Global.username, Global.password), Global.idServerUrl, loggerFactory);
-
-        ServerCaller commServer = new ServerCaller(tokenManager, Global.commServerApiUrl, Global.signalrClientId, loggerFactory);
-        ServerCaller appServer = new ServerCaller(tokenManager, Global.appServerApiUrl, Global.signalrClientId, loggerFactory);
-        ServerCaller hdataServer = new ServerCaller(tokenManager, Global.hdataServerApiUrl, Global.signalrClientId, loggerFactory);
-
-        Global.commServer = commServer;
-        Global.appServer = appServer;
-        Global.hdataServer = hdataServer;
-
-        //建立signalr实例，signalr为单例模式
-        FBoxSignalRConnection fboxSignalR = new FBoxSignalRConnection(Global.commServerSignalRUrl, Global.signalrClientId, tokenManager, Global.proxy, loggerFactory);
-
-        // 连接SignalR推送通道
-        fboxSignalR.start();
-//        fboxSignalR.onHubProxyCreated();
-        // signalr连上后，请看src/main/java/FBoxSignalRConnection.java 接受推送数据的回调类。
-
-        System.out.println("Box list:");
-//        try {
-//以下为调接口示例，可忽略，若使用，参数请根据文档填写自己的账号下的参数
-
-        // 获取盒子列表接口示例，可忽略
-        try {
-            BoxGroup[] boxGroups = Global.appServer.executeGet("api/client/box/grouped", BoxGroup[].class);
-            // 返回的是 盒子分组-盒子注册项（BoxReg） 的二层结构
-//            for (BoxGroup group : boxGroups) {
-//                for (BoxReg boxReg : group.boxRegs) {
-//                    System.out.printf("\t%s\t%s\t%s\n", boxReg.alias, boxReg.box.boxNo, boxReg.box.boxType);
-//                }
-//            }
-//            commServer.executePost("box/300220120152/dmon/start", Object.class);
-            for (BoxGroup boxGroup : boxGroups) {
-                for (BoxReg boxReg : boxGroup.boxRegs) {
-                    commServer.executePost("box/" + boxReg.boxUid +"/dmon/start", Object.class);
-                    Thread.sleep(1000);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-//        try {
-//            JsonObject jsonObject = commServer.executePost("dmon/222171502968050130/start", JsonObject.class);
-//        } catch (IOException e) {
-//            System.out.println("调用失败!");
-//            e.printStackTrace();
-//        }
-
-//        try {
-//            commServer.executePost("box/-6025651360718913057/dmon/start", Object.class);
-//        } catch (Exception e) {
-//            System.out.println("500");
-//            e.printStackTrace();
-//        }
-        System.out.println("测试");
-
-
-
-//
-//            // 获取按通道的数据接口示例 （数组第1维是固定两个元素时间和值，第2维是单个通道的所有数据，第3维是请求的每个通道）
-//            Object[][][] result =
-////                    String  result =
-//                    Global.hdataServer.executePost(String.format("v2/hdata/get"),
-//                            new GetByChannelHdataArgs(channelIds, new Date().getTime() - 7 * 86400000, new Date().getTime(), -100, 3),
-////                    String.class);
-//                            Object[][][].class);
-//
-//            System.out.println(result);
-//
-//            SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyyMMdd");
-//
-//            for (int i = 0; i < result.length; i++) {
-//                Object[][] channel = result[i];
-//                System.out.print("Channel " + channelNames.get(i));
-//                for (Object[] datum : channel) {
-//                    System.out.printf("(%s: %s)", dateFormatter.format(new Date(Math.round((double) datum[0]))), datum[1]);
-//                }
-//                System.out.println();
-//            }
-//
-//            //获取按行的数据接口示例（每行固定有通道个数个数据，如果这行的时间某些通道没有值，则为null）
-//            ByRowHdata result2 =
-////            String result2 =
-//                    Global.hdataServer.executePost(String.format("v2/hdata/get"),
-//                            new GetByRowHdataArgs(channelIds, new Date().getTime() - 7 * 86400000, new Date().getTime(), -100, 3),
-////                            String.class);
-//                            ByRowHdata.class);
-////            System.out.println(result2);
-//
-//            for (ByRowHdataRow row : result2.rows) {
-//                System.out.print(dateFormatter.format(row.getTime()) + ": ");
-//                Object[] c = row.c;
-//                for (int i = 0; i < c.length; i++) {
-//                    Object value = c[i];
-//                    if (i == 0) {
-//                        System.out.printf("%s", value);
-//                    } else {
-//                        System.out.printf(",%s", value);
-//                    }
-//                }
-//                System.out.println();
-//            }
-
-
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
-//
-//
-//        Scanner s = new Scanner(System.in);
-//        s.nextLine();
-    }*/
-
-
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/entity/Item.java

@@ -1,24 +0,0 @@
-package com.huimv.produce.sgd.entity;
-
-
-public class Item {
-
-    public String id;
-
-    public String name;
-
-    public String devAlias;
-
-    public String dataType;
-    public String grpName;
-
-    @Override
-    public String toString() {
-        return "Items{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                ", devAlias='" + devAlias + '\'' +
-                ", dataType='" + dataType + '\'' +
-                '}';
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/entity/Monitory.java

@@ -1,20 +0,0 @@
-package com.huimv.produce.sgd.entity;
-
-
-import java.util.Arrays;
-
-public class Monitory {
-    public String id;
-    public String name;
-    public Item[] items;
-
-
-    @Override
-    public String toString() {
-        return "Monitory{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                ", items=" + Arrays.toString(items) +
-                '}';
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/entity/MonitoryGetArgs.java

@@ -1,27 +0,0 @@
-package com.huimv.produce.sgd.entity;
-
-
-import java.util.List;
-
-public class MonitoryGetArgs {
-    public List names;
-    public Long timeOut;
-    public List groupnames;
-    public MonitoryGetArgs() {
-    }
-    public MonitoryGetArgs(List names, Long timeOut, List groupnames) {
-        this.names = names;
-        this.timeOut = timeOut;
-        this.groupnames = groupnames;
-    }
-
-
-    @Override
-    public String toString() {
-        return "Test{" +
-                "names=" + names +
-                ", timeOut=" + timeOut +
-                ", groupnames=" + groupnames +
-                '}';
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/entity/MonitoryValue.java

@@ -1,122 +0,0 @@
-package com.huimv.produce.sgd.entity;
-
-
-import java.util.Date;
-
-public class MonitoryValue {
-
-    //监控点id
-    private  String id;
-
-    //时间戳，由于从缓存里拉的数据，所以需要时间戳来判断是否已经过期,UTC 时间
-    private Date timestamp;
-
-    //数据类型，见附录二
-    private int dataType;
-
-    //值
-    private Object value;
-
-    //监控点名称
-    private String name;
-
-    //盒子id
-    private long boxId;
-
-    //监控点状态，0：正常，1：无数据，2：超时，3：错误，4：Socket 异常，5：FDS 错误，16：未完成
-    private int status;
-
-    //盒子连接状态, 0：未知 ， 1：已连接 ，2：超时， 3：断开
-    private int connState;
-
-    //盒子的上线时间
-    private  Date connStateTimestamp ;
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Date getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public int getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(int dataType) {
-        this.dataType = dataType;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        this.value = value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public long getBoxId() {
-        return boxId;
-    }
-
-    public void setBoxId(long boxId) {
-        this.boxId = boxId;
-    }
-
-    public int getStatus() {
-        return status;
-    }
-
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
-    public int getConnState() {
-        return connState;
-    }
-
-    public void setConnState(int connState) {
-        this.connState = connState;
-    }
-
-    public Date getConnStateTimestamp() {
-        return connStateTimestamp;
-    }
-
-    public void setConnStateTimestamp(Date connStateTimestamp) {
-        this.connStateTimestamp = connStateTimestamp;
-    }
-
-    @Override
-    public String toString() {
-        return "MonitoryValue{" +
-                "id='" + id + '\'' +
-                ", timestamp=" + timestamp +
-                ", dataType=" + dataType +
-                ", value=" + value +
-                ", name='" + name + '\'' +
-                ", boxId=" + boxId +
-                ", status=" + status +
-                ", connState=" + connState +
-                ", connStateTimestamp=" + connStateTimestamp +
-                '}';
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/BoxServerResponseException.java

@@ -1,18 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-import org.apache.http.client.HttpResponseException;
-
-public class BoxServerResponseException extends HttpResponseException {
-    public BoxServerResponseException(int statusCode, String s) {
-        super(statusCode, s);
-    }
-
-    public BoxServerResponseException(int statusCode, String s, int errCode) {
-        super(statusCode, s);
-        this.errCode = errCode;
-    }
-
-    public int errCode;
-
-
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/ClientCredential.java

@@ -1,18 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public class ClientCredential {
-    public ClientCredential(String clientId, String clientSecret) {
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-    }
-
-    /// <summary>
-    /// API账号
-    /// </summary>
-    public String clientId;
-
-    /// <summary>
-    /// API secret
-    /// </summary>
-    public String clientSecret;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/ConsoleLogger.java

@@ -1,34 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class ConsoleLogger implements Logger {
-    private final String name;
-    private final SimpleDateFormat formatter;
-
-    ConsoleLogger(String name) {
-        this.formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        this.name = name;
-    }
-
-    @Override
-    public void logInformation(String msg) {
-        System.out.println(formatter.format(new Date()) + " [Info ][" + name + "] " + msg);
-    }
-
-    @Override
-    public void logWarning(String msg) {
-        System.out.println(formatter.format(new Date()) + " [Warn ][" + name + "] " + msg);
-    }
-
-    @Override
-    public void logError(String msg) {
-        System.out.println(formatter.format(new Date()) + " [Error][" + name + "] " + msg);
-    }
-
-    @Override
-    public void logTrace(String msg) {
-        System.out.println(formatter.format(new Date()) + " [Trace][" + name + "] " + msg);
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/ConsoleLoggerFactory.java

@@ -1,12 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public class ConsoleLoggerFactory implements LoggerFactory {
-    @Override
-    public Logger createLogger(String name) {
-        if (name == "FBoxSignalRConnection" || name == "SignalRConnectionBase" || name == "ServerCaller") {
-            return new ConsoleLogger(name);
-        }
-
-        return new NullLogger();
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/CredentialProvider.java

@@ -1,17 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public interface CredentialProvider {
-
-    /// <summary>
-    /// 获取用户密钥信息
-    /// </summary>
-    /// <returns></returns>
-    ClientCredential getClientCredential();
-
-    /// <summary>
-    /// 获取用户信息
-    /// </summary>
-    /// <returns></returns>
-    UserCredential getUserCredential();
-
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/Logger.java

@@ -1,10 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public interface Logger{
-    void logInformation(String msg);
-    void logWarning(String msg);
-    void logError(String msg);
-    void logTrace(String msg);
-}
-
-

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/LoggerFactory.java

@@ -1,5 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public interface LoggerFactory {
-    Logger createLogger(String name);
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/LoginFailedException.java

@@ -1,9 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-import org.apache.http.client.HttpResponseException;
-
-public class LoginFailedException extends HttpResponseException {
-    public LoginFailedException(int statusCode, String s) {
-        super(statusCode, s);
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/NullLogger.java

@@ -1,23 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public class NullLogger implements Logger {
-    @Override
-    public void logInformation(String msg) {
-        
-    }
-
-    @Override
-    public void logWarning(String msg) {
-
-    }
-
-    @Override
-    public void logError(String msg) {
-
-    }
-
-    @Override
-    public void logTrace(String msg) {
-
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/ServerCaller.java

@@ -1,301 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonSyntaxException;
-import org.apache.http.*;
-import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.ServiceUnavailableRetryStrategy;
-import org.apache.http.client.methods.*;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.client.cache.CacheConfig;
-import org.apache.http.impl.client.cache.ExponentialBackOffSchedulingStrategy;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.EntityUtils;
-
-import javax.net.ssl.SSLException;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.MalformedURLException;
-import java.net.SocketException;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class ServerCaller {
-    private static final long RETRY_SLEEP_TIME_MILLIS = 2000;
-    private static ArrayList<Class<?>> exceptionWhitelist = new ArrayList<>();
-    private static ArrayList<Class<?>> exceptionBlacklist = new ArrayList<>();
-
-    static {
-        // Retry if the server dropped connection on us
-        exceptionWhitelist.add(NoHttpResponseException.class);
-        // retry-this, since it may happens as part of a Wi-Fi to 3G failover
-        exceptionWhitelist.add(UnknownHostException.class);
-        // retry-this, since it may happens as part of a Wi-Fi to 3G failover
-        exceptionWhitelist.add(SocketException.class);
-
-        // never retry timeouts
-        exceptionBlacklist.add(InterruptedIOException.class);
-        // never retry SSL handshake failures
-        exceptionBlacklist.add(SSLException.class);
-    }
-
-    private final String baseUrl;
-    private final String signalrClientId;
-    private final Gson gson;
-    private final Logger logger;
-    private CloseableHttpClient http;
-    private TokenManager tokenManager;
-    private String accessToken;
-    private int maxRetries = 30;
-
-    public ServerCaller(TokenManager tokenManager, LoggerFactory loggerFactory) throws MalformedURLException {
-        this(tokenManager, null, null, loggerFactory);
-    }
-
-    public ServerCaller(TokenManager tokenManager, String signalrClientId, LoggerFactory loggerFactory) {
-        this(tokenManager, null, signalrClientId, null, null, loggerFactory);
-    }
-
-    public ServerCaller(TokenManager tokenManager, String baseUrl, String signalrClientId, LoggerFactory loggerFactory) {
-        this(tokenManager, baseUrl, signalrClientId, null, null, loggerFactory);
-    }
-
-    public ServerCaller(TokenManager tokenManager, String baseUrl, String signalrClientId, CloseableHttpClient http, HttpHost proxy, LoggerFactory loggerFactory) {
-        logger = loggerFactory.createLogger("ServerCaller");
-        this.baseUrl = baseUrl;
-        this.tokenManager = tokenManager;
-        this.signalrClientId = signalrClientId;
-        this.http = http;
-
-        this.gson = new GsonBuilder().create();
-
-        ArrayList<Header> headers = new ArrayList<>();
-        if (signalrClientId != null) {
-            headers.add(new BasicHeader("X-FBox-ClientId", signalrClientId));
-        }
-
-        if (http == null) {
-            CacheConfig cc = CacheConfig.DEFAULT;
-            ExponentialBackOffSchedulingStrategy ebo = new ExponentialBackOffSchedulingStrategy(cc);
-
-            HttpClientBuilder httpBuilder = HttpClients.custom()
-                    .setDefaultHeaders(headers).setServiceUnavailableRetryStrategy(new ServiceUnavailableRetryStrategy() {
-                        @Override
-                        public boolean retryRequest(HttpResponse response, int executionCount, HttpContext context) {
-                            if (executionCount > maxRetries)
-                                return false;
-                            if (response == null) {
-                                return false;
-                            }
-                            if (response.getStatusLine()== null) {
-                                return false;
-                            }
-                            switch (response.getStatusLine().getStatusCode()) {
-//                                case 401:
-//                                    Object otm = context.getAttribute("ServerCaller");
-//                                    if (otm == null)
-//                                        return false;
-//
-//                                    ServerCaller tm = (ServerCaller) otm;
-//                                    try {
-//                                        tm.accessToken = tm.tokenManager.getOrUpdateToken(tm.accessToken);
-//                                    } catch (IOException e) {
-//                                        System.err.printf("Error fetching token in service unavailable retry logic %s.\n", e.toString());
-//                                        return true;
-//                                    }
-//
-//                                    HttpClientContext clientContext = HttpClientContext.adapt(context);
-//                                    clientContext.getRequest().setHeader("Authorization", "Bearer " + tm.accessToken);
-//                                    return true;
-
-                                case HttpStatus.SC_BAD_GATEWAY:
-                                case HttpStatus.SC_SERVICE_UNAVAILABLE:
-                                    return true;
-                                default:
-                                    return false;
-                            }
-                        }
-
-                        @Override
-                        public long getRetryInterval() {
-                            return 1000;
-                        }
-                    })
-                    .setRetryHandler((exception, executionCount, context) -> {
-                        if (exception != null) {
-                            System.err.printf("Retrying due to %s.\n", exception.toString());
-                        }
-                        if (executionCount > maxRetries) {
-                            // Do not retry if over max retry count
-                            System.err.printf("Maxmimum retry count reached.\n");
-                            return false;
-                        } else if (isInList(exceptionBlacklist, exception)) {
-                            // immediately cancel retry if the error is blacklisted
-                            return false;
-                        } else if (isInList(exceptionWhitelist, exception)) {
-                            // immediately retry if error is whitelisted
-                        }
-
-                        HttpClientContext clientContext = HttpClientContext.adapt(context);
-                        if (clientContext == null) {
-                            return true;
-                        }
-
-                        HttpRequest request = clientContext.getRequest();
-                        if (request == null) {
-                            return true;
-                        }
-
-                        HttpResponse response = clientContext.getResponse();
-                        if (response == null) {
-                            return true;
-                        }
-                        StatusLine statusLine = response.getStatusLine();
-
-                        if (statusLine != null && statusLine.getStatusCode() == 401) {
-                            try {
-                                System.err.println("ServerCaller: try get another token for " + request.toString());
-                                this.accessToken = this.tokenManager.getOrUpdateToken(this.accessToken);
-                                request.setHeader("Authorization", "Bearer " + this.accessToken);
-                                return true;
-                            } catch (IOException e) {
-                                System.err.printf("Error fetching token in retry logic %s.\n", e.toString());
-                            }
-                        } else {
-
-                        }
-
-                        try {
-                            Thread.sleep(RETRY_SLEEP_TIME_MILLIS);
-                        } catch (InterruptedException e) {
-                        }
-                        return true;
-                    });
-            if (proxy != null)
-                httpBuilder = httpBuilder.setProxy(proxy);
-            this.http = httpBuilder.build();
-        }
-    }
-
-    protected boolean isInList(ArrayList<Class<?>> list, Throwable error) {
-        Iterator<Class<?>> itr = list.iterator();
-        while (itr.hasNext()) {
-            if (itr.next().isInstance(error)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public <T> T executeGet(String url, Class<T> responseType) throws IOException {
-        HttpGet request;
-        request = new HttpGet(baseUrl + url);
-        return executeCore(request, responseType);
-    }
-
-    public <T> T executePost(String url, Class<T> responseType) throws IOException {
-        return executePost(url, null, responseType);
-    }
-
-    public <T> T executePost(String url, Object entity, Class<T> responseType) throws IOException {
-        HttpPost request;
-        request = new HttpPost(baseUrl + url);
-        if (entity != null) {
-            String str = gson.toJson(entity);
-            request.setEntity(new StringEntity(str, ContentType.APPLICATION_JSON));
-        }
-        return executeCore(request, responseType);
-    }
-
-    public <T> T executePost(String url, HttpEntity body, Class<T> responseType) throws IOException {
-        HttpPost request;
-        request = new HttpPost(baseUrl + url);
-        if (body != null)
-            request.setEntity(body);
-        return executeCore(request, responseType);
-    }
-
-    public <T> T executePut(String url, HttpEntity body, Class<T> responseType) throws IOException {
-        HttpPut request;
-        request = new HttpPut(baseUrl + url);
-        request.setEntity(body);
-        return executeCore(request, responseType);
-    }
-
-    public <T> T executeDelete(String url, Class<T> responseType) throws IOException {
-        HttpDelete request;
-        request = new HttpDelete(baseUrl + url);
-        return executeCore(request, responseType);
-    }
-
-    private <T> T executeCore(HttpUriRequest request, Class<T> responseType) throws IOException {
-        if (this.accessToken == null) {
-            this.accessToken = this.tokenManager.getOrUpdateToken(this.accessToken);
-        }
-        request.setHeader("Authorization", "Bearer " + this.accessToken);
-        request.addHeader("Accept", "application/json; */*");
-        for (; ; ) {
-            String method = request.getMethod();
-            URI uri = request.getURI();
-         //   this.logger.logTrace(String.format("Executing request %s %s", method, uri));
-            CloseableHttpResponse response = null;
-            BasicHttpContext ctx = new BasicHttpContext();
-            ctx.setAttribute("ServerCaller", this);
-            try {
-                response = this.http.execute(request, ctx);
-            } catch (IOException e) {
-                System.err.printf("Request failed with error: %s.\n", e.toString());
-                throw e;
-            }
-            try {
-                StatusLine statusLine = response.getStatusLine();
-                if (statusLine == null)
-                    throw new HttpResponseException(0, "Null status line.");
-                int statusCode = statusLine.getStatusCode();
-              //  this.logger.logTrace(String.format("Executed request %s %s with code %d", method, uri, statusCode));
-                if (statusCode == 401) {
-//                    throw new HttpResponseException(401, "Unauthorized request");
-                    this.logger.logTrace("ServerCaller: 401 from " + request.getURI().toString());
-                    this.accessToken = this.tokenManager.getOrUpdateToken(this.accessToken);
-                    request.setHeader("Authorization", "Bearer " + this.accessToken);
-                    continue;
-                } else if (statusCode >= 300) {
-                    String exmsg = statusLine.getReasonPhrase();
-                    Header errCodeHeader = response.getFirstHeader("X-FBox-Code");
-                    int errCode = 0;
-                    if (errCodeHeader != null) {
-                        errCode = Integer.parseInt(errCodeHeader.getValue());
-                        exmsg += " code=" + errCode;
-                    }
-                    throw new BoxServerResponseException(statusCode, exmsg, errCode);
-                }
-                HttpEntity body = response.getEntity();
-                if (body != null && responseType != null) {
-                    String str = EntityUtils.toString(body);
-                    try {
-                        return gson.fromJson(str, responseType);
-                    } catch (JsonSyntaxException ex) {
-                        if (responseType.isAssignableFrom(String.class))
-                            return (T) str;
-                        else
-                            throw new IllegalArgumentException("Response cannot be parsed to " + responseType.toString() + " contentType is " + body.getContentType());
-                    }
-                }
-//                this.logger.logTrace(String.format("Request %s %s returned with empty body.", method, uri));
-                return null;
-            } finally {
-                response.close();
-            }
-        }
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/StaticCredentialProvider.java

@@ -1,21 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public class StaticCredentialProvider implements CredentialProvider {
-    private final ClientCredential clientCred;
-    private final UserCredential userCred;
-
-    public StaticCredentialProvider(String clientId, String clientSecret, String userName, String password) {
-        this.clientCred = new ClientCredential(clientId, clientSecret);
-        this.userCred = new UserCredential(userName, password);
-    }
-
-    @Override
-    public ClientCredential getClientCredential() {
-        return clientCred;
-    }
-
-    @Override
-    public UserCredential getUserCredential() {
-        return userCred;
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/TokenManager.java

@@ -1,132 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import org.apache.http.HttpEntity;
-import org.apache.http.NameValuePair;
-import org.apache.http.StatusLine;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpResponseException;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TokenManager implements Closeable {
-    private final CredentialProvider credentialProvider;
-    private final Object tokenLock;
-    private final Gson gson;
-    private final Logger logger;
-    private CloseableHttpClient http;
-    private final String idSvrUrl;
-
-    public TokenManager(CredentialProvider credentialProvider, LoggerFactory loggerFactory) {
-        this(credentialProvider, "https://account.flexem.com/core/", loggerFactory);
-    }
-
-    public TokenManager(CredentialProvider credentialProvider, String idSvrUrl, LoggerFactory loggerFactory) {
-        this(credentialProvider, idSvrUrl, null, loggerFactory);
-    }
-
-    public TokenManager(CredentialProvider credentialProvider, String idSvrUrl, CloseableHttpClient http, LoggerFactory loggerFactory) {
-        this.logger = loggerFactory.createLogger("TokenManager");
-        this.idSvrUrl = idSvrUrl;
-        this.credentialProvider = credentialProvider;
-        this.tokenLock = new Object();
-        this.http = http;
-        if (http == null) {
-            this.http = HttpClients.createDefault();
-        }
-        this.gson = new GsonBuilder().create();
-    }
-
-    private String accessToken;
-
-    public String getOrUpdateToken(String currentToken) throws IOException {
-        if (currentToken == null) {
-            String at = accessToken;
-            if (at != null)
-                return at;
-        }
-
-        synchronized (tokenLock) {
-            String at = accessToken;
-            if (at != null && at != currentToken)
-                return at;
-
-            at = fetchToken();
-            accessToken = at;
-            return at;
-        }
-    }
-
-    private String fetchToken() throws IOException {
-        ClientCredential clientCredential = credentialProvider.getClientCredential();
-        UserCredential userCredential = credentialProvider.getUserCredential();
-        // 登录接口，用于获取access_Token，access_Token有效期2小时
-        HttpPost request = new HttpPost(idSvrUrl + "connect/token");
-        List<NameValuePair> formparams = new ArrayList<NameValuePair>();
-        formparams.add(new BasicNameValuePair("username", userCredential.userName));
-        formparams.add(new BasicNameValuePair("password", userCredential.password));
-        formparams.add(new BasicNameValuePair("scope", "openid offline_access fbox email profile"));
-        formparams.add(new BasicNameValuePair("client_id", clientCredential.clientId));
-        formparams.add(new BasicNameValuePair("client_secret", clientCredential.clientSecret));
-        formparams.add(new BasicNameValuePair("grant_type", "password"));
-        request.setEntity(new UrlEncodedFormEntity(formparams));
-        CloseableHttpResponse response = http.execute(request);
-        //401
-        final RequestConfig params = RequestConfig.custom().setConnectTimeout(8000).setSocketTimeout(8000).build();
-        request.setConfig(params);
-
-
-        try {
-            StatusLine statusLine = response.getStatusLine();
-            HttpEntity entity = response.getEntity();
-            int statusCode = statusLine.getStatusCode();
-            // the following status code range mostly caused by incorrect credential.
-            if (statusCode >= 400 && statusCode < 500 && statusCode != 429) {
-                throw new LoginFailedException(
-                        statusLine.getStatusCode(),
-                        statusLine.getReasonPhrase());
-            }
-            if (statusCode >= 300) {
-                throw new HttpResponseException(statusCode, statusLine.getReasonPhrase());
-            }
-            if (entity == null) {
-                throw new ClientProtocolException("Response contains no content");
-            }
-            ContentType contentType = ContentType.getOrDefault(entity);
-            Charset charset = contentType.getCharset();
-            Reader reader = new InputStreamReader(entity.getContent(), charset);
-            String at;
-            try {
-                at = (gson.fromJson(reader, TokenResponse.class)).access_token;
-            } finally {
-                reader.close();
-            }
-            this.logger.logTrace("Fetched new token.");
-            return at;
-        } finally {
-            response.close();
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (this.http instanceof Closeable) {
-            ((Closeable) this.http).close();
-        }
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/TokenResponse.java

@@ -1,5 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public class TokenResponse {
-    public String access_token;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/UserCredential.java

@@ -1,18 +0,0 @@
-package com.huimv.produce.sgd.fbox;
-
-public class UserCredential {
-    public UserCredential(String userName, String password) {
-        this.userName = userName;
-        this.password = password;
-    }
-
-    /// <summary>
-    /// 用户名
-    /// </summary>
-    public String userName;
-
-    /// <summary>
-    /// 密码
-    /// </summary>
-    public String password;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/Box.java

@@ -1,24 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class Box {
-    public long id;
-    public String boxNo;
-    public int boxType;
-    public int connState;
-    public int net;
-    public int feat;
-    public Cs cs;
-
-    @Override
-    public String toString() {
-        return "Box{" +
-                "id=" + id +
-                ", boxNo='" + boxNo + '\'' +
-                ", boxType=" + boxType +
-                ", connState=" + connState +
-                ", net=" + net +
-                ", feat=" + feat +
-                ", cs=" + cs +
-                '}';
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/BoxGroup.java

@@ -1,8 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class BoxGroup {
-    public long id;
-    public String name;
-    public BoxReg[] boxRegs;
-}
-

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/BoxReg.java

@@ -1,18 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class BoxReg {
-    public long id;
-    public String alias;
-    public String boxUid;
-    public Box box;
-
-    @Override
-    public String toString() {
-        return "BoxReg{" +
-                "id=" + id +
-                ", alias='" + alias + '\'' +
-                ", boxUid='" + boxUid + '\'' +
-                ", box=" + box +
-                '}';
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/BoxStateChanged.java

@@ -1,7 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class BoxStateChanged {
-    public long id;
-    public int state;
-    public int net;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/ByRowHdata.java

@@ -1,5 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class ByRowHdata {
-    public ByRowHdataRow[] rows;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/ByRowHdataRow.java

@@ -1,19 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-import java.util.Date;
-
-public class ByRowHdataRow {
-    /**
-     * 时间戳（1970-1-1以来的毫秒数）
-     */
-    public long t;
-
-    public Date getTime (){
-        return new Date(t);
-    }
-
-    /**
-     * 一行中每个单元格的值
-     */
-    public Object[] c;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/Cs.java

@@ -1,13 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-
-public class Cs {
-    public String signalRUrl;
-
-    @Override
-    public String toString() {
-        return "Cs{" +
-                "signalRUrl='" + signalRUrl + '\'' +
-                '}';
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/DataSource.java

@@ -1,53 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class DataSource {
-    /**
-     * PLC别名
-     */
-    public String devAlias;
-
-    /**
-     * 站号
-     */
-    public int stationNo;
-
-    /**
-     * 数据类型
-     */
-    public int dataType;
-
-    /**
-     * 寄存器ID（与寄存器位宽联合使用）
-     */
-    public int regId;
-
-    /**
-     * 寄存器位宽 (与寄存器ID联合使用)
-     */
-    public int ioWidth;
-    /// <summary>
-    ///     寄存器名称
-    /// </summary>
-    public String regName;
-    /// <summary>
-    ///     主地址
-    /// </summary>
-    public int addr;
-    /// <summary>
-    ///     子地址
-    /// </summary>
-    public int subAddr;
-    /// <summary>
-    ///     数据块(DB块)
-    /// </summary>
-    public int addrBlk;
-    /// <summary>
-    /// 是否启用按位索引
-    /// </summary>
-    public boolean bitIndexEnabled;
-    /// <summary>
-    /// 按位索引号
-    /// </summary>
-    public int bitIndex;
-
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/DataType.java

@@ -1,76 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;//package fbox.models;
-//
-//public enum DataType {
-//        /// <summary>
-//        /// 位
-//        /// </summary>
-//        Bit(0),
-//
-//            /// <summary>
-//            /// 16位无符号
-//            /// </summary>
-//        UInt16 = 1,
-//
-//            /// <summary>
-//            /// 16位有符号
-//            /// </summary>
-//        Int16 = 2,
-//
-//            /// <summary>
-//            /// 16位BCD
-//            /// </summary>
-//        Bcd16 = 3,
-//
-//            /// <summary>
-//            /// 16位16进制
-//            /// </summary>
-//        Hex16 = 4,
-//
-//            /// <summary>
-//            /// 16位二进制
-//            /// </summary>
-//        Binary16 = 5,
-//
-//            /// <summary>
-//            /// 32位无符号
-//            /// </summary>
-//            [Description("32位无符号")]
-//        UInt32 = 11,
-//
-//            /// <summary>
-//            /// 32位有符号
-//            /// </summary>
-//            [Description("32位有符号")]
-//        Int32 = 12,
-//
-//            /// <summary>
-//            /// 32位BCD
-//            /// </summary>
-//            [Description("32位BCD")]
-//        Bcd32 = 13,
-//
-//            /// <summary>
-//            /// 32位16进制
-//            /// </summary>
-//            [Description("32位16进制")]
-//        Hex32 = 14,
-//
-//            /// <summary>
-//            /// 32位二进制
-//            /// </summary>
-//            [Description("32位二进制")]
-//        Binary32 = 15,
-//
-//            /// <summary>
-//            /// 单精度浮点
-//            /// </summary>
-//            [Description("单精度浮点")]
-//        Single = 16,
-//
-//            /// <summary>
-//            /// 字符串
-//            /// </summary>
-//            [Description("字符串")]
-//        String = 30,
-//    }
-//}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/DmonWriteValueArgs.java

@@ -1,14 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class DmonWriteValueArgs {
-    public DmonWriteValueArgs(String groupName, String name, String value) {
-        this.name = name;
-        this.value = value;
-        this.groupName = groupName;
-    }
-
-    public String name;
-    public int type = 0;
-    public String value;
-    public String groupName;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/GetByChannelHdataArgs.java

@@ -1,11 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-import java.util.List;
-
-
-public class GetByChannelHdataArgs extends GetHdataArgs{
-    public GetByChannelHdataArgs(List<Long> ids, long begin, long end, int limit, int tr) {
-        super(1, ids, begin, end, limit, tr);
-    }
-}
-

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/GetByRowHdataArgs.java

@@ -1,9 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-import java.util.List;
-
-public class GetByRowHdataArgs extends GetHdataArgs{
-    public GetByRowHdataArgs(List<Long> ids, long begin, long end, int limit, int tr) {
-        super(0, ids, begin, end, limit, tr);
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/GetDmonValuesById.java

@@ -1,9 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class GetDmonValuesById {
-    public GetDmonValuesById(long[] ids) {
-        this.ids = ids;
-    }
-
-    public long[] ids;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/GetDmonValuesByName.java

@@ -1,9 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class GetDmonValuesByName {
-    public GetDmonValuesByName(String[] names) {
-        this.names = names;
-    }
-
-    public String[] names;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/GetHdataArgs.java

@@ -1,39 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-import java.util.List;
-
-public class GetHdataArgs {
-    /**
-     * 通道ID列表
-     */
-    public List<Long> ids;
-    /**
-     * 开始时间（1970-1-1以来的毫秒数）
-     */
-    public long begin;
-    /**
-     * 结束时间（1970-1-1以来的毫秒数）
-     */
-    public long end;
-    /**
-     * 取值最大个数
-     * 正数表示从开始时间向结束时间取最多limit个，负值表示从结束时间向开始时间最多取limit个
-     */
-    public int limit;
-    /**
-     * 时间范围边界类型
-     * 0:全开区间, 1:左开右闭, 2: 左闭右开, 3:全闭区间
-     */
-    public int tr;
-
-    public int type;
-
-    public GetHdataArgs(int type, List<Long> ids, long begin, long end, int limit, int tr) {
-        this.ids = ids;
-        this.begin = begin;
-        this.end = end;
-        this.limit = limit;
-        this.tr = tr;
-        this.type = type;
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/HdataChannelDef.java

@@ -1,33 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class HdataChannelDef extends DataSource {
-    /**
-     * 通道ID
-     */
-    public long uid;
-
-    /**
-     * 通道名称
-     */
-    public String name;
-
-    /**
-     * 单位
-     */
-    public String unit;
-
-    /**
-     * 描述
-     */
-    public String desc;
-
-    /**
-     * 整数位
-     */
-    public int intDigits;
-
-    /**
-     * 小数位
-     */
-    public int fracDigits;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/HdataControlOptions.java

@@ -1,5 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class HdataControlOptions extends DataSource {
-        public int ctrlType;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/models/HdataDef.java

@@ -1,33 +0,0 @@
-package com.huimv.produce.sgd.fbox.models;
-
-public class HdataDef {
-
-    public long uid;
-
-    /**
-     * 名称
-     */
-    public String name;
-
-    /**
-     * 采样时间
-     */
-    public int period;
-
-    /**
-     * 关联的盒子ID
-     */
-    public long boxId;
-
-    /**
-     * 是否使用使能设置
-     */
-    public boolean hasCtrl;
-
-    /**
-     * 使能控制详细配置
-     */
-    public HdataControlOptions ctrl;
-
-    public HdataChannelDef[] channels;
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/signalr/SignalRConnectionBase.java

@@ -1,189 +0,0 @@
-package com.huimv.produce.sgd.fbox.signalr;
-
-import com.github.signalr4j.client.ConnectionState;
-import com.github.signalr4j.client.http.java.JavaHttpConnection;
-import com.github.signalr4j.client.hubs.HubConnection;
-import com.github.signalr4j.client.hubs.HubProxy;
-import com.github.signalr4j.client.transport.ServerSentEventsTransport;
-import com.huimv.produce.sgd.fbox.Logger;
-import com.huimv.produce.sgd.fbox.LoggerFactory;
-import com.huimv.produce.sgd.fbox.LoginFailedException;
-import com.huimv.produce.sgd.fbox.TokenManager;
-
-import java.io.IOException;
-import java.net.Proxy;
-import java.util.Date;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-public abstract class SignalRConnectionBase {
-    private final Semaphore connectEvent;
-    private HubConnection hubConnection;
-    private HubProxy hubProxy;
-    private final Logger logger;
-    private final LoggerFactory loggerFactory;
-    private final SignalRLoggerWrapper javaconnLogger;
-    private final SignalRLoggerWrapper sseLogger;
-    private String hubUrl;
-    private String signalrClientId;
-    private Proxy proxy;
-    private TokenManager tokenManager;
-    private String accessToken;
-    private boolean shouldGetNewToken;
-    private int retryCount;
-    private long lastConnectedTime = 0;
-    private boolean reconnecting;
-    private boolean monitorStarted;
-
-    public SignalRConnectionBase(String hubUrl, String signalrClientId, TokenManager tokenManager, Proxy proxy, LoggerFactory loggerFactory) {
-        this.hubUrl = hubUrl;
-        this.signalrClientId = signalrClientId;
-        this.proxy = proxy;
-        this.loggerFactory = loggerFactory;
-        this.logger = loggerFactory.createLogger("SignalRConnectionBase");
-        this.sseLogger = new SignalRLoggerWrapper(this.loggerFactory.createLogger("ServerSentEventsTransport"));
-        this.javaconnLogger = new SignalRLoggerWrapper(this.loggerFactory.createLogger("SignalRTransportConnection"));
-        this.tokenManager = tokenManager;
-        this.connectEvent = new Semaphore(1);
-        new Thread(() -> {
-            try {
-                SignalRConnectWorker();
-            } catch (InterruptedException e) {
-                logger.logError("SignalR connect worker exited with " + e.toString());
-            }
-        }).start();
-    }
-
-    private void HookEvents() {
-        this.hubConnection.error(throwable -> onConnectionError(throwable));
-        this.hubConnection.reconnecting(() -> onReconnecting());
-        this.hubConnection.reconnected(() -> onReconnected());
-        this.hubConnection.closed(() -> onConnectionClosed());
-        this.hubConnection.connected(() -> connected());
-    }
-
-    private void UnhookEvents() {
-        this.hubConnection.error(null);
-        this.hubConnection.reconnecting(null);
-        this.hubConnection.reconnected(null);
-        this.hubConnection.closed(null);
-        this.hubConnection.connected(null);
-    }
-
-    private void onReconnecting() {
-        this.logger.logInformation("Reconnecting. hubconn=" + this.hubConnection.getUrl());
-    }
-
-    private void onReconnected() {
-        this.logger.logInformation("Reconnected. hubconn=" + this.hubConnection.getUrl());
-    }
-
-    private void onConnectionClosed() {
-        this.logger.logInformation("Closed. hubconn=" + this.hubConnection.getUrl());
-        this.connectEvent.release();
-    }
-
-    private void onConnectionError(Throwable e) {
-        this.logger.logInformation(String.format("Connection error. exception=%s. hubConnection=%s", e, this.hubConnection.getUrl()));
-        if (e != null) {
-            Throwable cause = e.getCause();
-            if (cause != null && cause.getMessage() != null && cause.getMessage().contains("401")) {
-                this.shouldGetNewToken = true;
-            }
-        }
-    }
-
-    protected abstract void onHubProxyCreated(HubProxy hubProxy);
-
-    protected abstract void onHubProxyDestroyed(HubProxy hubProxy);
-
-    public void connected() {
-        this.reconnecting = false;
-        this.logger.logInformation("Connected. hubconn=" + this.hubConnection.getUrl());
-    }
-
-    private void UpdateToken() throws LoginFailedException, InterruptedException {
-        int retryCount2 = 0;
-        for (; ; ) {
-            try {
-                this.accessToken = this.tokenManager.getOrUpdateToken(this.accessToken);
-                break;
-            } catch (LoginFailedException e) {
-                throw e;
-            } catch (IOException e) {
-                logger.logError("Get token failed. " + e.toString());
-                int waitTime2 = retryCount2++ * 1000;
-                if (waitTime2 > 300000) {
-                    waitTime2 = 5000;
-                }
-                Thread.sleep(waitTime2);
-            }
-        }
-    }
-
-    private void SignalRConnectWorker() throws InterruptedException {
-        //signalr重连代码
-        for (; ; ) {
-            do {
-//                this.logger.logTrace("Current connection state is " + this.hubConnection.getState());
-                this.connectEvent.acquire();
-            }
-            while (this.hubConnection != null && this.hubConnection.getState() == ConnectionState.Connected);
-
-            try {
-                //刷新token
-                UpdateToken();
-                if (this.hubConnection != null)
-                    this.UnhookEvents();
-                if (this.hubProxy != null) {
-                    onHubProxyDestroyed(this.hubProxy);
-                }
-                if (this.hubConnection != null)
-                    this.hubConnection.disconnect();
-                this.hubConnection = new HubConnection(hubUrl, "cid=" + signalrClientId, true, new SignalRLoggerWrapper(loggerFactory.createLogger("SignalR")));
-                this.hubConnection.setReconnectOnError(false);
-                this.HookEvents();
-                this.hubProxy = this.hubConnection.createHubProxy("clienthub");
-                this.onHubProxyCreated(this.hubProxy);
-                this.hubConnection.setCredentials(request -> request.addHeader("Authorization", "Bearer " + this.accessToken));
-                this.connectEvent.drainPermits();
-                this.hubConnection.start(new ServerSentEventsTransport(this.sseLogger, new JavaHttpConnection(this.javaconnLogger))).get(40, TimeUnit.SECONDS);
-                this.retryCount = 0;
-                this.shouldGetNewToken = false;
-                this.lastConnectedTime = new Date().getTime();
-            } catch (Exception e) {
-                assert hubConnection.getState() != ConnectionState.Connected;
-                if (e instanceof LoginFailedException) {
-                    this.logger.logError("Login error.");
-                } else {
-                    this.logger.logError("Hub connection start error. " + e.toString());
-                    e.printStackTrace();
-                }
-                Throwable cause = e.getCause();
-                if (cause != null) {
-                    String msg = cause.getMessage();
-                    if (msg != null && msg.contains("401"))
-                        this.shouldGetNewToken = true;
-                }
-
-                int waitTime = this.retryCount++ * 1000;
-                if (waitTime > 60000) {
-                    waitTime = 5000;
-                }
-
-                if (waitTime > 0)
-                    Thread.sleep(waitTime);
-                this.connectEvent.release();
-                this.reconnecting = true;
-            }
-        }
-    }
-
-    public void start() {
-        this.connectEvent.release();
-    }
-
-    public void stop() {
-        this.hubConnection.stop();
-    }
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/sgd/fbox/signalr/SignalRLoggerWrapper.java

@@ -1,28 +0,0 @@
-package com.huimv.produce.sgd.fbox.signalr;
-
-import com.github.signalr4j.client.LogLevel;
-import com.github.signalr4j.client.Logger;
-
-public class SignalRLoggerWrapper implements Logger {
-
-    private final  com.huimv.produce.sgd.fbox.Logger logger;
-
-    public SignalRLoggerWrapper( com.huimv.produce.sgd.fbox.Logger logger){
-        this.logger = logger;
-    }
-    @Override
-    public void log(String message, LogLevel level) {
-        switch (level) {
-            case Critical:
-                this.logger.logError(message);
-                break;
-            case Information:
-                this.logger.logInformation(message);
-                break;
-            case Verbose:
-                this.logger.logTrace(message);
-                break;
-        }
-    }
-
-}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SaveEventFromEventTimmer.java

@@ -29,7 +29,7 @@ public class SaveEventFromEventTimmer {
 
 
     //每小时执行一次
-    @Scheduled(cron = " 0 */59 * * * ?")
+//    @Scheduled(cron = " 0 */59 * * * ?")
     private void updateBox() {
 
 

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SysTelcomEnentTimmer.java

@@ -25,7 +25,7 @@ public class SysTelcomEnentTimmer {
     private ISysTelecomEventService sysTelecomEventService;
 
        //每小时执行一次
-       @Scheduled(cron = " 0 */59 * * * ? ")
+//       @Scheduled(cron = " 0 */59 * * * ? ")
        private void updateBox() {
            //获得设备列表 查找烘干数据
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/utils/DateUtil.java

@@ -0,0 +1,289 @@
+package com.huimv.produce.utils;
+
+import cn.hutool.core.date.DateTime;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Component
+@Slf4j
+public class DateUtil {
+    /**
+     * 获取今天
+     * @return String
+     * */
+    public String getToday(){
+        return new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+    }
+    /**
+     * 获取昨天
+     * @return String
+     * */
+    public String getYestoday(){
+        Calendar cal=Calendar.getInstance();
+        cal.add(Calendar.DATE,-1);
+        Date time=cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+    /**
+     * 获取本月开始日期
+     * @return String
+     * **/
+    public String getMonthStart(){
+        Calendar cal=Calendar.getInstance();
+        cal.add(Calendar.MONTH, 0);
+        cal.set(Calendar.DAY_OF_MONTH, 1);
+        Date time=cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+    /**
+     * 获取本月最后一天
+     * @return String
+     * **/
+    public String getMonthEnd(){
+        Calendar cal=Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+        Date time=cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+    /**
+     * 获取本周的第一天
+     * @return String
+     * **/
+    public String getWeekStart(){
+        Calendar cal=Calendar.getInstance();
+        cal.add(Calendar.WEEK_OF_MONTH, 0);
+        cal.set(Calendar.DAY_OF_WEEK, 2);
+        Date time=cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+    /**
+     * 获取本周的最后一天
+     * @return String
+     * **/
+    public String getWeekEnd(){
+        Calendar cal=Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_WEEK, cal.getActualMaximum(Calendar.DAY_OF_WEEK));
+        cal.add(Calendar.DAY_OF_WEEK, 1);
+        Date time=cal.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+    /**
+     * 获取本年的第一天
+     * @return String
+     * **/
+    public String getYearStart(){
+        return new SimpleDateFormat("yyyy").format(new Date())+"-01-01";
+    }
+
+    /**
+     * 获取本年的最后一天
+     * @return String
+     * **/
+    public String getYearEnd(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.MONTH,calendar.getActualMaximum(Calendar.MONTH));
+        calendar.set(Calendar.DAY_OF_MONTH,calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        Date currYearLast = calendar.getTime();
+        return new SimpleDateFormat("yyyy-MM-dd").format(currYearLast);
+    }
+
+    //Long转换为Date格式
+    public String fromLongToDate(Long time ,String format) {
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        Date date = new Date(time);
+        return sdf.format(date);
+    }
+
+    public String formatTimestampToDatetime(Timestamp timestamp){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(timestamp);
+    }
+
+    public String formatTimestampToDate(Timestamp timestamp){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(timestamp);
+    }
+
+    //格式化本年
+    public String getThisYear(){
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        return String.valueOf(year);
+    }
+
+    //格式化本月
+    public String getThisMonth(){
+        Calendar cal = Calendar.getInstance();
+        int month = cal.get(Calendar.MONTH) + 1;
+        if(String.valueOf(month).length()==1)
+        {
+            return "0"+String.valueOf(month);
+        }else{
+            return String.valueOf(month);
+        }
+    }
+
+    //格式化日期时间
+    public String formatDateTime(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = sdf.parse(dateText);
+        return sdf.format(date);
+    }
+
+    public String formatDateText(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = sdf.parse(dateText);
+        return sdf.format(date);
+    }
+
+    public String formatDateText(Date date) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(date);
+    }
+
+    public Date parseDateTime(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.parse(dateText);
+    }
+
+    public Date parseDate(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.parse(dateText);
+    }
+
+    public Date parseDate2(String dateText) throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.parse(dateText);
+    }
+
+    public Long parseDateTimeLong(String dateText) throws ParseException {
+        if(dateText.indexOf("T") != -1){
+            dateText = dateText.replace("T"," ");
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = sdf.parse(dateText);
+        return date.getTime();
+    }
+
+
+
+    //
+    public Date getTodayDate() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.parse(sdf.format(new Date()));
+    }
+
+    public String getTodayDateText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(new Date());
+    }
+
+    public String getTodayText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(new Date());
+    }
+
+    public String getTodayMissionText() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+        return sdf.format(new Date());
+    }
+
+    public String getStartDateInThisMonth(){
+        DateTime date = cn.hutool.core.date.DateUtil.date();
+        return (cn.hutool.core.date.DateUtil.beginOfMonth(date) + "").substring(0, 10);
+    }
+
+    public String getEndDateInThisMonth(){
+        DateTime date = cn.hutool.core.date.DateUtil.date();
+        return (date + "").substring(0, 10);
+    }
+
+    /**
+     * 获取过去或者未来 任意天内的日期数组
+     * @param intervals      intervals天内
+     * @return              日期数组
+     */
+    public ArrayList<String> test(int intervals ) {
+        ArrayList<String> pastDaysList = new ArrayList<>();
+        ArrayList<String> fetureDaysList = new ArrayList<>();
+        for (int i = 0; i <intervals; i++) {
+            pastDaysList.add(getPastDate(i));
+            fetureDaysList.add(getFetureDate(i));
+        }
+        return pastDaysList;
+    }
+
+    /**
+     * 获取过去第几天的日期
+     *
+     * @param past
+     * @return
+     */
+    public String getPastDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String result = format.format(today);
+        return result;
+    }
+
+    /**
+     * 获取未来 第 past 天的日期
+     * @param past
+     * @return
+     */
+    public String getFetureDate(int past) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + past);
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String result = format.format(today);
+        return result;
+    }
+
+    //重新构建日期
+    public String rebuildDateTime(String text){
+        return text.substring(0,4)+"-"+text.substring(4,6)+"-"+text.substring(6,8)+" "+text.substring(8,10)+":"+text.substring(10,12)+":"+text.substring(12,14);
+    }
+
+    public static void main(String[] args){
+        DateUtil du = new DateUtil();
+        //
+        du.test1();
+    }
+
+    private void test1() {
+        String text = "20211201104300";
+//        String text = "1234567890abcd";
+        String date = text.substring(0,4)+"-"+text.substring(4,6)+"-"+text.substring(6,8)+" "+text.substring(8,10)+":"+text.substring(10,12)+":"+text.substring(12,14);
+        System.out.println("date="+date);
+    }
+}