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

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/utils/LongRangeUtils.java

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.intelligent.utils;
 
-import com.alibaba.fastjson.JSON;
 import com.chinaitop.depot.intelligent.basicdata.model.TWarningThreshold;
 import com.chinaitop.depot.intelligent.basicdata.service.WarningThresholdService;
 import com.chinaitop.depot.intelligent.grainsituation.mapper.TTestdataLayerMapper;
@@ -14,7 +13,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -111,12 +109,20 @@ public class LongRangeUtils {
                 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(STR_ZERO)) {
                     threshold = warningThresholdService.getByCfCodeAndwName(house, INT_ZERO, "6972", "6983");
                     wLowest = warningThresholdService.getByCfCodeAndwName(house, INT_ZERO, "6972", "6982");
                     wWarning = warningThresholdService.getByCfCodeAndwName(house, INT_ZERO, "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().toString().equals(new BigDecimal(STR_TEMP).toString())).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::add);
                 List<BigDecimal> collect = ps.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(t -> t.getTemp()).collect(Collectors.toList());
@@ -171,6 +177,31 @@ public class LongRangeUtils {
                         }
                     }
                 }
+                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.getCode();
+                        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.getCode();
+                            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;
@@ -197,6 +228,31 @@ public class LongRangeUtils {
                         }
                     }
                 }
+                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.getCode();
+                        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.getCode();
+                            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 = INT_ZERO;