业务代码及entity数据处理

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java

 package com.yeejoin.amos.boot.module.jxiop.biz.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
@@ -27,7 +29,7 @@ public class IdxBizPvPointVarCentralValue{
     /**
      * 
      */
-	@TableField("SEQUENCE_NBR")
+	@TableId(value = "SEQUENCE_NBR" ,type = IdType.UUID)
     private String sequenceNbr;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCorrelation.java

@@ -71,13 +71,13 @@ public class IdxBizPvPointVarCorrelation{
      * 
      */
 	@TableField("ANALYSIS_POINT_ID")
-    private Integer analysisPointId;
+    private String analysisPointId;
 
     /**
      * 
      */
 	@TableField("PROCESS_POINT_ID")
-    private Integer processPointId;
+    private String processPointId;
 
     /**
      * 片区
@@ -131,7 +131,7 @@ public class IdxBizPvPointVarCorrelation{
      * 
      */
 	@TableField("PROCESS_INDEX_ADDRESS")
-    private Integer processIndexAddress;
+    private String processIndexAddress;
 
     /**
      * 设备名称

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -372,7 +372,7 @@ public class CommonServiceImpl {
     //遍历处理数据-组装风机
     public void foreachHandlerConditionVariabAnalyseFan(String tableName, List<IdxBizFanPointVarCorrelation> list, String startTime, String endTime, IdxBizFanPointProcessVariableClassification idxBizFanPointProcessVariableClassification) {
 
-        String sql1 = String.format("select value from %s where address='%s' and  time >= '%s' and where time <= '%s' ", tableName, idxBizFanPointProcessVariableClassification.getIndexAddress(),startTime,endTime);
+        String sql1 = String.format("select value from %s where address='%s' and  time >= '%s' and  time <= '%s' ", tableName, idxBizFanPointProcessVariableClassification.getIndexAddress(),startTime,endTime);
         List<Map<String, Object>> returnList = influxdbUtil.query(sql1);
         List<Map<String, Object>> params = new ArrayList<>();
         returnList.forEach((k) -> {
@@ -386,7 +386,7 @@ public class CommonServiceImpl {
             logger.info("---------------------------------风机相关性-----------开始查询influxdb--------------------------------");
             List<Map<String, Object>> params1 = new ArrayList<>();
             List<Map<String, Object>> requestParams = new ArrayList<>();
-            String sql = String.format("select value from %s where address='%s' and  time >= '%s' and where time <= '%s' ", tableName, idxBizFanPointVarCorrelation.getProcessIndexAddress(),startTime,endTime);
+            String sql = String.format("select value from %s where address='%s' and  time >= '%s' and  time <= '%s' ", tableName, idxBizFanPointVarCorrelation.getProcessIndexAddress(),startTime,endTime);
             List<Map<String, Object>> returnList1 = influxdbUtil.query(sql);
             returnList.forEach((k) -> {
                 Map<String, Object> map = new HashMap<>();
@@ -673,8 +673,8 @@ public class CommonServiceImpl {
                     idxBizFanPointVarCentralValue.setProcess2Min(idxCentralValue.getDoubleValue("process2Min"));
                     idxBizFanPointVarCentralValue.setProcess3Min(idxCentralValue.getDoubleValue("process3Min"));
                     idxBizFanPointVarCentralValue.setProcess1Max(idxCentralValue.getDoubleValue("process1Max"));
-                    idxBizFanPointVarCentralValue.setPorcess2Max(idxCentralValue.getDoubleValue("process1Max"));
-                    idxBizFanPointVarCentralValue.setProcess3Max(idxCentralValue.getDoubleValue("process1Max"));
+                    idxBizFanPointVarCentralValue.setPorcess2Max(idxCentralValue.getDoubleValue("process2Max"));
+                    idxBizFanPointVarCentralValue.setProcess3Max(idxCentralValue.getDoubleValue("process3Max"));
                     idxBizFanPointVarCentralValue.setAnalysisPointId(idxCentralValue.getString("analysisVariableId"));
                     idxBizFanPointVarCentralValue.setAnalysisPointName(IdxBizFanPointProcessVariableClassification.getPointName());
                     idxBizFanPointVarCentralValue.setProcessPoint1Id(idxCentralValue.getString("processVariable1Id"));
@@ -814,8 +814,8 @@ public class CommonServiceImpl {
                     idxBizPvPointVarCentralValue.setProcess2Min(idxCentralValue.getDoubleValue("process2Min"));
                     idxBizPvPointVarCentralValue.setProcess3Min(idxCentralValue.getDoubleValue("process3Min"));
                     idxBizPvPointVarCentralValue.setProcess1Max(idxCentralValue.getDoubleValue("process1Max"));
-                    idxBizPvPointVarCentralValue.setProcess2Max(idxCentralValue.getDoubleValue("process1Max"));
-                    idxBizPvPointVarCentralValue.setProcess3Max(idxCentralValue.getDoubleValue("process1Max"));
+                    idxBizPvPointVarCentralValue.setProcess2Max(idxCentralValue.getDoubleValue("process2Max"));
+                    idxBizPvPointVarCentralValue.setProcess3Max(idxCentralValue.getDoubleValue("process3Max"));
                     idxBizPvPointVarCentralValue.setAnalysisPointId(idxCentralValue.getString("analysisVariableId"));
                     idxBizPvPointVarCentralValue.setAnalysisPointIdName(idxBizPvPointProcessVariableClassification.getPointName());
                     idxBizPvPointVarCentralValue.setProcessPoint1Id(idxCentralValue.getString("processVariable1Id"));