测温代码修改

src/main/java/com/chinaitop/depot/intelligent/pushs/service/impl/GrainPushsServiceImpl.java

@@ -95,7 +95,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                 }
                 String orgId = temperatureRecordService.getOrgId(cDcsCodes.get(0));
                 ts.forEach(obj -> {
-                    String testdataId = uuidUtils.getCodeId(orgId, "t_testdata");
+                    String testdataId = UuidUtils.getCode();
                     TTestdata tTestdata = (TTestdata) obj;
                     String house = tTestdata.getStorehouse();
                     Date time = tTestdata.getTime();
@@ -105,12 +105,14 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                     //获取报警阈值信息6972测温 6983温度高限 6982温度底限 6991温度预警
                     TWarningThreshold threshold = null; //温度高限
                     TWarningThreshold wLowest = null; //温度底限
-                    TWarningThreshold wWarning = null; //温度预警
+                    TWarningThreshold thresholdWarning = null; //低温温度预警
+                    TWarningThreshold wLowestWarning = null; //低温温度预警
                     String ilqYq = tTestdata.getIlqYq();
                     if (ilqYq.equals("0")) {
-                        threshold = warningThresholdService.getByCfCodeAndwName(house, 0, "6972", "6983");
-                        wLowest = warningThresholdService.getByCfCodeAndwName(house, 0, "6972", "6982");
-                        wWarning = warningThresholdService.getByCfCodeAndwName(house, 0, "6972", "6991");
+                        threshold = warningThresholdService.getByCfCodeAndwName(house, 0, "6972", "6983");//获取高温报警阀值
+                        wLowest = warningThresholdService.getByCfCodeAndwName(house, 0, "6972", "6982");//获取低温报警阀值
+                        thresholdWarning = warningThresholdService.getByCfCodeAndwName(house, 0, "6972", "6991");//获取高温预警
+                        wLowestWarning = warningThresholdService.getByCfCodeAndwName(house, 0, "6972", "7248");//低温温度预警
 
                     }
                     BigDecimal wholeSum = ps.stream().filter(TPoints -> !TPoints.getTemp().equals(new BigDecimal("250.0"))).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -139,22 +141,21 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                         //用于判断是否已经报警
                         boolean temp = false;
                         BigDecimal wh = threshold.getThreshold();
-                        //-1 小于 0 等于 1 大于
+                        //-1 小于 0 等于 1 大于 高温报警
                         if (wholeMax.compareTo(wh) == 1 && !wholeMax.toString().equals("250.0") && ilqYq.equals("0")) {
-                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                            String tid = UuidUtils.getCode();
                             String desc = "整仓粮温(" + wholeMax + ")高于阈值(" + wh + ")";
                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, threshold, wholeMax, wh, time, desc, dataSource2, "0", "0");
                             tWarningThresholdHistorieList.add(tt);
                             temp = true;
                         }
-                        if (wWarning != null && !temp && !wholeMax.toString().equals("250.0") && ilqYq.equals("0")) {
-                            //-1 小于 0 等于 1 大于
-                            BigDecimal ww = wWarning.getThreshold();
-                            BigDecimal subtract = wh.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
-                            if (wholeMax.compareTo(subtract) == 1 && ilqYq.equals("0")) {
-                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
-                                String desc = "整仓粮温(" + wholeMax + ")高于阈值(" + subtract + ")";
-                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wholeMax, subtract, time, desc, dataSource2, "0", "1");
+                        if (thresholdWarning != null && !temp && !wholeMax.toString().equals("250.0") && ilqYq.equals("0")) {
+                            //-1 小于 0 等于 1 大于 高温预警
+                            BigDecimal ww = thresholdWarning.getThreshold();
+                            if (wholeMax.compareTo(ww) == 1 && ilqYq.equals("0")) {
+                                String tid = UuidUtils.getCode();
+                                String desc = "整仓粮温(" + wholeMax + ")高于阈值(" + ww + ")";
+                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, thresholdWarning, wholeMax, ww, time, desc, dataSource2, "0", "1");
                                 tWarningThresholdHistorieList.add(tt);
                             }
                         }
@@ -163,22 +164,21 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                         //用于判断是否已经报警
                         boolean temp = false;
                         BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
-                        //-1 小于 0 等于 1 大于
+                        //-1 小于 0 等于 1 大于 低温报警
                         if (wMin.compareTo(wl) == -1 && !wMin.toString().equals("250.0") && ilqYq.equals("0")) {
-                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                            String tid = UuidUtils.getCode();
                             String desc = "整仓粮温(" + wMin + ")低于阈值(" + wl + ")";
                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, wMin, wl, time, desc, dataSource2, "0", "0");
                             tWarningThresholdHistorieList.add(tt);
                             temp = true;
                         }
-                        if (wWarning != null && !temp && !wMin.toString().equals("250.0") && ilqYq.equals("0")) {
-                            //-1 小于 0 等于 1 大于
-                            BigDecimal ww = wWarning.getThreshold();
-                            BigDecimal wadd = wl.add(ww);//高温减去阈值
-                            if (wMin.compareTo(wadd) == -1 && ilqYq.equals("0")) {
-                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
-                                String desc = "整仓粮温(" + wMin + ")低于阈值(" + wadd + ")";
-                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wMin, wadd, time, desc, dataSource2, "0", "1");
+                        if (wLowestWarning != null && !temp && !wMin.toString().equals("250.0") && ilqYq.equals("0")) {
+                            //-1 小于 0 等于 1 大于 低温预警
+                            BigDecimal ww = wLowestWarning.getThreshold();
+                            if (wMin.compareTo(ww) == -1 && ilqYq.equals("0")) {
+                                String tid = UuidUtils.getCode();
+                                String desc = "整仓粮温(" + wMin + ")低于阈值(" + ww + ")";
+                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowestWarning, wMin, ww, time, desc, dataSource2, "0", "1");
                                 tWarningThresholdHistorieList.add(tt);
                             }
                         }
@@ -211,7 +211,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                         tTestdataLayer.setLmin(lsyerMin);
                         tTestdataLayer.setLhouse(house);
                         tTestdataLayer.setLtime(time);
-                        tTestdataLayer.setId(uuidUtils.getCodeId(orgId, "t_testdata_layer"));
+                        tTestdataLayer.setId(UuidUtils.getCode());
                         tTestdataLayer.setOrgId(orgId);
                         tTestdataLayer.setDataSource(dataSource2);
                         tTestdataLayer.setLqId(testdataId);
@@ -232,23 +232,22 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                                     if (threshold != null && ilqYq.equals("0")) {
                                         boolean temp = false;
                                         BigDecimal threshold1 = threshold.getThreshold().setScale(2, RoundingMode.HALF_UP);
-                                        //-1 小于 0 等于 1 大于
+                                        //-1 小于 0 等于 1 大于 高温报警
                                         if (te.compareTo(threshold1) == 1 && !te.toString().equals("250.0")) {
                                             // tid id,cfCdoe 仓房编码,threshold 报警实体包括orgID,tthreshold 检测值,wThreshold 预警或报警设置值,date 检测时间,desc 描述信息,mode 0测温，1测虫，2测气,warning 0报警，1预警
-                                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                            String tid = UuidUtils.getCode();
                                             String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")高于阈值(" + threshold1 + ")";
                                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, threshold, te, threshold1, time, desc, dataSource2, "0", "0");
                                             tWarningThresholdHistorieList.add(tt);
                                             temp = true;
                                         }
-                                        if (wWarning != null && !temp && !te.toString().equals("250.0")) {
-                                            //-1 小于 0 等于 1 大于
-                                            BigDecimal ww = wWarning.getThreshold();
-                                            BigDecimal subtract = threshold1.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
-                                            if (te.compareTo(subtract) == 1 && ilqYq.equals("0")) {
-                                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
-                                                String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")高于阈值(" + subtract + ")";
-                                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, subtract, time, desc, dataSource2, "0", "1");
+                                        if (thresholdWarning != null && !temp && !te.toString().equals("250.0")) {
+                                            //-1 小于 0 等于 1 大于 高温预警
+                                            BigDecimal ww = thresholdWarning.getThreshold();
+                                            if (te.compareTo(ww) == 1 && ilqYq.equals("0")) {
+                                                String tid = UuidUtils.getCode();
+                                                String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")高于阈值(" + ww + ")";
+                                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, thresholdWarning, te, ww, time, desc, dataSource2, "0", "1");
                                                 tWarningThresholdHistorieList.add(tt);
                                             }
                                         }
@@ -256,22 +255,21 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                                     if (wLowest != null && ilqYq.equals("0")) {
                                         boolean temp = false;
                                         BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
-                                        //-1 小于 0 等于 1 大于
+                                        //-1 小于 0 等于 1 大于 低温报警
                                         if (te.compareTo(wl) == -1 && !te.toString().equals("250.0")) {
-                                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                            String tid = UuidUtils.getCode();
                                             String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")低于阈值(" + wl + ")";
                                             TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, te, wl, time, desc, dataSource2, "0", "0");
                                             tWarningThresholdHistorieList.add(tt);
                                             temp = true;
                                         }
-                                        if (wWarning != null && !temp && !te.toString().equals("250.0")) {
-                                            //-1 小于 0 等于 1 大于
-                                            BigDecimal ww = wWarning.getThreshold();
-                                            BigDecimal wadd = wl.add(ww).setScale(2, RoundingMode.HALF_UP);//高温减去阈值
-                                            if (te.compareTo(wadd) == -1 && ilqYq.equals("0")) {
-                                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
-                                                String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")低于阈值(" + wadd + ")";
-                                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, wadd, time, desc, dataSource2, "0", "1");
+                                        if (wLowestWarning != null && !temp && !te.toString().equals("250.0")) {
+                                            //-1 小于 0 等于 1 大于 低温预警
+                                            BigDecimal ww = wLowestWarning.getThreshold();
+                                            if (te.compareTo(ww) == -1 && ilqYq.equals("0")) {
+                                                String tid = UuidUtils.getCode();
+                                                String desc = "第" + keyL + "层,第" + keyR + "行,第" + keyC + "列粮温(" + te + ")低于阈值(" + ww + ")";
+                                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowestWarning, te, ww, time, desc, dataSource2, "0", "1");
                                                 tWarningThresholdHistorieList.add(tt);
                                             }
                                         }