feat：新增湿度报警数据入库

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

@@ -74,7 +74,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                 ArrayList<TTestdata> tTestdataList = Lists.newArrayList();
                 //粮温每层数据
                 ArrayList<TTestdataLayer> tTestdataLayerArrayList = Lists.newArrayList();
-                //报警数据
+                // 温度报警数据 和 湿度报警数据
                 ArrayList<TWarningThresholdHistory> tWarningThresholdHistorieList = Lists.newArrayList();
 
                 String replace = grainTemperatureData.replace("\"Y\"", "\"y\"").replace("\"X\"", "\"x\"").replace("\"Z\"", "\"z\"");
@@ -105,12 +105,20 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                     TWarningThreshold threshold = null; //温度高限
                     TWarningThreshold wLowest = null; //温度底限
                     TWarningThreshold wWarning = null; //温度预警
+
+                    // 获取报警阈值信息7252 测湿 7253湿度高限 7254湿度低限 7509湿度预警
+                    TWarningThreshold thresholdHumidity = null; //湿度高限
+                    TWarningThreshold wLowestHumidity = null; //湿度底限
+                    TWarningThreshold wWarningHumidity = 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");
 
+                        thresholdHumidity = warningThresholdService.getByCfCodeAndwName(house, 0, "7252", "7253");
+                        wLowestHumidity = warningThresholdService.getByCfCodeAndwName(house, 0, "7252", "7254");
+                        wWarningHumidity = warningThresholdService.getByCfCodeAndwName(house, 0, "7252", "7509");
                     }
                     BigDecimal wholeSum = ps.stream().filter(TPoints -> !TPoints.getTemp().equals(new BigDecimal("250.0"))).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::add);
                     List<BigDecimal> collect = ps.stream().filter(TPoints -> !TPoints.getTemp().equals(new BigDecimal("250.0"))).map(t -> t.getTemp()).collect(Collectors.toList());
@@ -158,6 +166,31 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                             }
                         }
                     }
+                    if (thresholdHumidity != null) {
+                        //用于判断是否已经报警
+                        boolean temp = false;
+                        BigDecimal wh = thresholdHumidity.getThreshold();
+                        BigDecimal inh = tTestdata.getInh();
+                        //-1 小于 0 等于 1 大于
+                        if (inh.compareTo(wh) == 1 && !inh.toString().equals("250.0") && ilqYq.equals("0")) {
+                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                            String desc = "整仓仓湿(" + inh + ")高于阈值(" + wh + ")";
+                            TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, thresholdHumidity, inh, wh, time, desc, dataSource2, "0", "0");
+                            tWarningThresholdHistorieList.add(tt);
+                            temp = true;
+                        }
+                        if (wWarningHumidity != null && !temp && !inh.toString().equals("250.0") && ilqYq.equals("0")) {
+                            //-1 小于 0 等于 1 大于
+                            BigDecimal ww = wWarningHumidity.getThreshold();
+                            BigDecimal subtract = wh.subtract(ww); //高温减去阈值
+                            if (inh.compareTo(subtract) == 1 && ilqYq.equals("0")) {
+                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                String desc = "整仓仓湿(" + inh + ")高于阈值(" + subtract + ")";
+                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarningHumidity, inh, subtract, time, desc, dataSource2, "0", "1");
+                                tWarningThresholdHistorieList.add(tt);
+                            }
+                        }
+                    }
                     if (wLowest != null) {
                         //用于判断是否已经报警
                         boolean temp = false;
@@ -182,6 +215,31 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                             }
                         }
                     }
+                    if (wLowestHumidity != null) {
+                        //用于判断是否已经报警
+                        boolean temp = false;
+                        BigDecimal wl = wLowest.getThreshold();
+                        BigDecimal inh = tTestdata.getInh();
+                        //-1 小于 0 等于 1 大于
+                        if (inh.compareTo(wl) == -1 && !inh.toString().equals("250.0") && ilqYq.equals("0")) {
+                            String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                            String desc = "整仓仓湿(" + inh + ")低于阈值(" + wl + ")";
+                            TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowestHumidity, inh, wl, time, desc, dataSource2, "0", "0");
+                            tWarningThresholdHistorieList.add(tt);
+                            temp = true;
+                        }
+                        if (wWarningHumidity != null && !temp && !inh.toString().equals("250.0") && ilqYq.equals("0")) {
+                            //-1 小于 0 等于 1 大于
+                            BigDecimal ww = wWarningHumidity.getThreshold();
+                            BigDecimal wadd = wl.add(ww);//高温减去阈值
+                            if (inh.compareTo(wadd) == -1 && ilqYq.equals("0")) {
+                                String tid = uuidUtils.getCodeId(orgId, "t_warning_threshold_history");
+                                String desc = "整仓仓湿(" + inh + ")低于阈值(" + wadd + ")";
+                                TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarningHumidity, inh, wadd, time, desc, dataSource2, "0", "1");
+                                tWarningThresholdHistorieList.add(tt);
+                            }
+                        }
+                    }
 
                     Map<String, List<TPoints>> layerGroupV = ps.stream().collect(Collectors.groupingBy(t -> t.getZ()));
                     int layerNumber = 0;