优化测温异步接受数据,日志打印

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

@@ -68,248 +68,254 @@ public class LongRangeUtils {
     @Transactional(rollbackFor = Exception.class)
     @Async("executor")
     public void asyncMethodGrainData(String grainTemperatureData) {
-        logger.info("测温异步接受！");
-        tTestdataLogMapper.insertSelective(new TTestdataLog(DateUtils.getDate(), grainTemperatureData));
-        String dataSource2 = "";
-        //粮温元数据
-        ArrayList<TTestdata> tTestdataList = Lists.newArrayList();
-        //粮温每层数据
-        ArrayList<TTestdataLayer> tTestdataLayerArrayList = Lists.newArrayList();
-        //报警数据
-        ArrayList<TWarningThresholdHistory> tWarningThresholdHistorieList = Lists.newArrayList();
+        try {
+            logger.info("测温异步接受！");
+            tTestdataLogMapper.insertSelective(new TTestdataLog(DateUtils.getDate(), grainTemperatureData));
+            logger.info("测温源数据已入库1！");
+            String dataSource2 = "";
+            //粮温元数据
+            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\"");
-        ArrayList<Object> ts = JsonToObjectUtils.jsonToObjects(replace, TTestdata.class);
-        ArrayList<TTestdata> tts = Lists.newArrayList();
-        ts.forEach(obj -> {
-            TTestdata s = (TTestdata) obj;
-            tts.add(s);
-        });
-        List<String> cDcsCodes = tts.stream().map(TTestdata::getStorehouse).collect(Collectors.toList());
-        List<Date> cTimes = tts.stream().map(TTestdata::getTime).collect(Collectors.toList());
-        List<String> lqTypes = tts.stream().map(TTestdata::getIlqYq).collect(Collectors.toList());
-        //校验重复数据
-        List<TTestdata> byCodeAndTimes = temperatureRecordService.getByCodeAndTimes(cDcsCodes, cTimes, lqTypes);
-        if (byCodeAndTimes != null && byCodeAndTimes.size() > INT_ZERO) {
-            logger.info("上传数据重复！");
-            return;
-        }
-        String orgId = temperatureRecordService.getOrgId(cDcsCodes.get(INT_ZERO));
-        ts.forEach(obj -> {
-            String testdataId = uuidUtils.getCode();
-            TTestdata tTestdata = (TTestdata) obj;
-            String house = tTestdata.getStorehouse();
-            Date time = tTestdata.getTime();
-            List<TPoints> ps = tTestdata.getPoints();
-            String sP = JsonToObjectUtils.listToString(ps);
-            tTestdata.settPoints(sP);
-            //获取报警阈值信息6972测温 6983温度高限 6982温度底限 6991温度预警
-            TWarningThreshold threshold = null; //温度高限
-            TWarningThreshold wLowest = null; //温度底限
-            TWarningThreshold wWarning = 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");
-
-            }
-            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());
-            double doubleValue = wholeSum.doubleValue();
-            double wholeAvg = INT_ZERO;
-            if (collect.size() > INT_ZERO) {
-                wholeAvg = doubleValue / collect.size();
-            }
-            tTestdata.setAvg(new BigDecimal(wholeAvg == INT_ZERO ? TEMP : wholeAvg).setScale(2, RoundingMode.HALF_UP));
-            BigDecimal wholeMax = ps.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(TPoints::getTemp).reduce(BD_MINUS_THREE, BigDecimal::max);
-            tTestdata.setMax(new BigDecimal(wholeMax.toString()));
-            List<Double> wholeMins = Lists.newArrayList();
-            List<BigDecimal> bList = ps.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(t -> t.getTemp()).collect(Collectors.toList());
-            bList.forEach(bigDecimal -> {
-                wholeMins.add(bigDecimal.doubleValue());
+            String replace = grainTemperatureData.replace("\"Y\"", "\"y\"").replace("\"X\"", "\"x\"").replace("\"Z\"", "\"z\"");
+            ArrayList<Object> ts = JsonToObjectUtils.jsonToObjects(replace, TTestdata.class);
+            ArrayList<TTestdata> tts = Lists.newArrayList();
+            ts.forEach(obj -> {
+                TTestdata s = (TTestdata) obj;
+                tts.add(s);
             });
-            Double wholeMin = wholeMins.size() == INT_ZERO ? 250.0 : Collections.min(wholeMins);
-            BigDecimal wMin = new BigDecimal(wholeMin).setScale(2, RoundingMode.HALF_UP);
-            tTestdata.setMin(wMin);
-            tTestdata.setId(testdataId);
-            tTestdata.setOrgId(orgId);
-            tTestdata.setDataSource(dataSource2);
-            tTestdataList.add(tTestdata);
-            if (threshold != null) {
-                //用于判断是否已经报警
-                boolean temp = false;
-                BigDecimal wh = threshold.getThreshold();
-                //-1 小于 0 等于 1 大于
-                if (wholeMax.compareTo(wh) == 1 && ilqYq.equals(STR_ZERO)) {
-                    String tid = uuidUtils.getCode();
-                    TWarningThresholdHistory tt = null;
-                    StringBuffer desc = new StringBuffer();
-                    if (!wholeMax.toString().equals(STR_TEMP)) {
-                        String str = desc.append("整仓粮温(").append(wholeMax).append(")高于阈值(").append(wh).append(")").toString();
-                        tt = warningMessage.saveWThreshold(tid, house, threshold, wholeMax, wh, time, str, dataSource2, STR_ZERO, STR_ZERO);
-                    } else {
-                        tt = warningMessage.saveWThreshold(tid, house, wWarning, wholeMax, wh, time, "整仓设备异常", dataSource2, STR_ZERO, ConstUtils.STR_TWO);
-                    }
-                    tWarningThresholdHistorieList.add(tt);
-                    temp = true;
+            List<String> cDcsCodes = tts.stream().map(TTestdata::getStorehouse).collect(Collectors.toList());
+            List<Date> cTimes = tts.stream().map(TTestdata::getTime).collect(Collectors.toList());
+            List<String> lqTypes = tts.stream().map(TTestdata::getIlqYq).collect(Collectors.toList());
+            //校验重复数据
+            List<TTestdata> byCodeAndTimes = temperatureRecordService.getByCodeAndTimes(cDcsCodes, cTimes, lqTypes);
+            if (byCodeAndTimes != null && byCodeAndTimes.size() > INT_ZERO) {
+                logger.info("上传数据重复！");
+                return;
+            }
+            String orgId = temperatureRecordService.getOrgId(cDcsCodes.get(INT_ZERO));
+            ts.forEach(obj -> {
+                String testdataId = uuidUtils.getCode();
+                TTestdata tTestdata = (TTestdata) obj;
+                String house = tTestdata.getStorehouse();
+                Date time = tTestdata.getTime();
+                List<TPoints> ps = tTestdata.getPoints();
+                String sP = JsonToObjectUtils.listToString(ps);
+                tTestdata.settPoints(sP);
+                //获取报警阈值信息6972测温 6983温度高限 6982温度底限 6991温度预警
+                TWarningThreshold threshold = null; //温度高限
+                TWarningThreshold wLowest = null; //温度底限
+                TWarningThreshold wWarning = 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");
+
                 }
-                if (wWarning != null && !temp && !wholeMax.toString().equals(TEMP) && ilqYq.equals(STR_ZERO)) {
+                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());
+                double doubleValue = wholeSum.doubleValue();
+                double wholeAvg = INT_ZERO;
+                if (collect.size() > INT_ZERO) {
+                    wholeAvg = doubleValue / collect.size();
+                }
+                tTestdata.setAvg(new BigDecimal(wholeAvg == INT_ZERO ? TEMP : wholeAvg).setScale(2, RoundingMode.HALF_UP));
+                BigDecimal wholeMax = ps.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(TPoints::getTemp).reduce(BD_MINUS_THREE, BigDecimal::max);
+                tTestdata.setMax(new BigDecimal(wholeMax.toString()));
+                List<Double> wholeMins = Lists.newArrayList();
+                List<BigDecimal> bList = ps.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(t -> t.getTemp()).collect(Collectors.toList());
+                bList.forEach(bigDecimal -> {
+                    wholeMins.add(bigDecimal.doubleValue());
+                });
+                Double wholeMin = wholeMins.size() == INT_ZERO ? 250.0 : Collections.min(wholeMins);
+                BigDecimal wMin = new BigDecimal(wholeMin).setScale(2, RoundingMode.HALF_UP);
+                tTestdata.setMin(wMin);
+                tTestdata.setId(testdataId);
+                tTestdata.setOrgId(orgId);
+                tTestdata.setDataSource(dataSource2);
+                tTestdataList.add(tTestdata);
+                if (threshold != null) {
+                    //用于判断是否已经报警
+                    boolean temp = false;
+                    BigDecimal wh = threshold.getThreshold();
                     //-1 小于 0 等于 1 大于
-                    BigDecimal ww = wWarning.getThreshold();
-                    BigDecimal subtract = wh.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
-                    if (wholeMax.compareTo(subtract) == 1 && ilqYq.equals(STR_ZERO)) {
+                    if (wholeMax.compareTo(wh) == 1 && ilqYq.equals(STR_ZERO)) {
                         String tid = uuidUtils.getCode();
+                        TWarningThresholdHistory tt = null;
                         StringBuffer desc = new StringBuffer();
-                        String str = desc.append("整仓粮温(").append(wholeMax).append(")高于阈值(").append(subtract).append(")").toString();
-                        TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wholeMax, subtract, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
+                        if (!wholeMax.toString().equals(STR_TEMP)) {
+                            String str = desc.append("整仓粮温(").append(wholeMax).append(")高于阈值(").append(wh).append(")").toString();
+                            tt = warningMessage.saveWThreshold(tid, house, threshold, wholeMax, wh, time, str, dataSource2, STR_ZERO, STR_ZERO);
+                        } else {
+                            tt = warningMessage.saveWThreshold(tid, house, wWarning, wholeMax, wh, time, "整仓设备异常", dataSource2, STR_ZERO, ConstUtils.STR_TWO);
+                        }
                         tWarningThresholdHistorieList.add(tt);
+                        temp = true;
+                    }
+                    if (wWarning != null && !temp && !wholeMax.toString().equals(TEMP) && ilqYq.equals(STR_ZERO)) {
+                        //-1 小于 0 等于 1 大于
+                        BigDecimal ww = wWarning.getThreshold();
+                        BigDecimal subtract = wh.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
+                        if (wholeMax.compareTo(subtract) == 1 && ilqYq.equals(STR_ZERO)) {
+                            String tid = uuidUtils.getCode();
+                            StringBuffer desc = new StringBuffer();
+                            String str = desc.append("整仓粮温(").append(wholeMax).append(")高于阈值(").append(subtract).append(")").toString();
+                            TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wholeMax, subtract, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
+                            tWarningThresholdHistorieList.add(tt);
+                        }
                     }
                 }
-            }
-            if (wLowest != null) {
-                //用于判断是否已经报警
-                boolean temp = false;
-                BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
-                //-1 小于 0 等于 1 大于
-                if (wMin.compareTo(wl) == -1 && !wMin.toString().equals(STR_TEMP00) && ilqYq.equals(STR_ZERO)) {
-                    String tid = uuidUtils.getCode();
-                    StringBuffer desc = new StringBuffer();
-                    String str = desc.append("整仓粮温(").append(wMin).append(")低于阈值(").append(wl).append(")").toString();
-                    TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, wMin, wl, time, str, dataSource2, STR_ZERO, STR_ZERO);
-                    tWarningThresholdHistorieList.add(tt);
-                    temp = true;
-                }
-                if (wWarning != null && !temp && !wMin.toString().equals(STR_TEMP00) && ilqYq.equals(STR_ZERO)) {
+                if (wLowest != null) {
+                    //用于判断是否已经报警
+                    boolean temp = false;
+                    BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
                     //-1 小于 0 等于 1 大于
-                    BigDecimal ww = wWarning.getThreshold();
-                    BigDecimal wadd = wl.add(ww);//高温减去阈值
-                    if (wMin.compareTo(wadd) == -1 && ilqYq.equals(STR_ZERO)) {
+                    if (wMin.compareTo(wl) == -1 && !wMin.toString().equals(STR_TEMP00) && ilqYq.equals(STR_ZERO)) {
                         String tid = uuidUtils.getCode();
                         StringBuffer desc = new StringBuffer();
-                        String str = desc.append("整仓粮温(").append(wMin).append(")低于阈值(").append(wadd).append(")").toString();
-                        TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wMin, wadd, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
+                        String str = desc.append("整仓粮温(").append(wMin).append(")低于阈值(").append(wl).append(")").toString();
+                        TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, wMin, wl, time, str, dataSource2, STR_ZERO, STR_ZERO);
                         tWarningThresholdHistorieList.add(tt);
+                        temp = true;
+                    }
+                    if (wWarning != null && !temp && !wMin.toString().equals(STR_TEMP00) && ilqYq.equals(STR_ZERO)) {
+                        //-1 小于 0 等于 1 大于
+                        BigDecimal ww = wWarning.getThreshold();
+                        BigDecimal wadd = wl.add(ww);//高温减去阈值
+                        if (wMin.compareTo(wadd) == -1 && ilqYq.equals(STR_ZERO)) {
+                            String tid = uuidUtils.getCode();
+                            StringBuffer desc = new StringBuffer();
+                            String str = desc.append("整仓粮温(").append(wMin).append(")低于阈值(").append(wadd).append(")").toString();
+                            TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, wMin, wadd, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
+                            tWarningThresholdHistorieList.add(tt);
+                        }
                     }
                 }
-            }
 
-            Map<String, List<TPoints>> layerGroupV = ps.stream().collect(Collectors.groupingBy(t -> t.getZ()));
-            int layerNumber = INT_ZERO;
-            for (Map.Entry<String, List<TPoints>> entry : layerGroupV.entrySet()) {
-                TTestdataLayer tTestdataLayer = new TTestdataLayer();
-                tTestdataLayer.setLayernumber(++layerNumber);
-                List<TPoints> points = entry.getValue();
-                BigDecimal lsyerSums = points.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::add);
-                List<BigDecimal> collect1 = points.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(t -> t.getTemp()).collect(Collectors.toList());
-                double lsyerSum = lsyerSums.doubleValue();
-                tTestdataLayer.setLz(points.get(INT_ZERO).getZ());
-                double lsyerAvg = INT_ZERO;
-                if (collect1.size() > INT_ZERO) {
-                    lsyerAvg = lsyerSum / collect1.size();
-                }
-                tTestdataLayer.setLavg(new BigDecimal(lsyerAvg == INT_ZERO ? 250 : lsyerAvg));
-                BigDecimal lsyerMax = points.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(TPoints::getTemp).reduce(BD_MINUS_THREE, BigDecimal::max);
-                tTestdataLayer.setLmax(new BigDecimal(lsyerMax.toString()));
-                List<Double> lsyerMins = Lists.newArrayList();
-                List<BigDecimal> bigList = points.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(t -> t.getTemp()).collect(Collectors.toList());
-                bigList.forEach(bigDecimal -> {
-                    lsyerMins.add(bigDecimal.doubleValue());
-                });
-                Double wlsyerMin = lsyerMins.size() == INT_ZERO ? 250.0 : Collections.min(lsyerMins);
-                BigDecimal lsyerMin = new BigDecimal(wlsyerMin);
-                tTestdataLayer.setLmin(lsyerMin);
-                tTestdataLayer.setLhouse(house);
-                tTestdataLayer.setLtime(time);
-                tTestdataLayer.setId(uuidUtils.getCode());
-                tTestdataLayer.setOrgId(orgId);
-                tTestdataLayer.setDataSource(dataSource2);
-                tTestdataLayer.setLqId(testdataId);
-                tTestdataLayerArrayList.add(tTestdataLayer);
+                Map<String, List<TPoints>> layerGroupV = ps.stream().collect(Collectors.groupingBy(t -> t.getZ()));
+                int layerNumber = INT_ZERO;
+                for (Map.Entry<String, List<TPoints>> entry : layerGroupV.entrySet()) {
+                    TTestdataLayer tTestdataLayer = new TTestdataLayer();
+                    tTestdataLayer.setLayernumber(++layerNumber);
+                    List<TPoints> points = entry.getValue();
+                    BigDecimal lsyerSums = points.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(TPoints::getTemp).reduce(BigDecimal.ZERO, BigDecimal::add);
+                    List<BigDecimal> collect1 = points.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(t -> t.getTemp()).collect(Collectors.toList());
+                    double lsyerSum = lsyerSums.doubleValue();
+                    tTestdataLayer.setLz(points.get(INT_ZERO).getZ());
+                    double lsyerAvg = INT_ZERO;
+                    if (collect1.size() > INT_ZERO) {
+                        lsyerAvg = lsyerSum / collect1.size();
+                    }
+                    tTestdataLayer.setLavg(new BigDecimal(lsyerAvg == INT_ZERO ? 250 : lsyerAvg));
+                    BigDecimal lsyerMax = points.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(TPoints::getTemp).reduce(BD_MINUS_THREE, BigDecimal::max);
+                    tTestdataLayer.setLmax(new BigDecimal(lsyerMax.toString()));
+                    List<Double> lsyerMins = Lists.newArrayList();
+                    List<BigDecimal> bigList = points.stream().filter(TPoints -> !TPoints.getTemp().toString().equals(new BigDecimal(STR_TEMP).toString())).map(t -> t.getTemp()).collect(Collectors.toList());
+                    bigList.forEach(bigDecimal -> {
+                        lsyerMins.add(bigDecimal.doubleValue());
+                    });
+                    Double wlsyerMin = lsyerMins.size() == INT_ZERO ? 250.0 : Collections.min(lsyerMins);
+                    BigDecimal lsyerMin = new BigDecimal(wlsyerMin);
+                    tTestdataLayer.setLmin(lsyerMin);
+                    tTestdataLayer.setLhouse(house);
+                    tTestdataLayer.setLtime(time);
+                    tTestdataLayer.setId(uuidUtils.getCode());
+                    tTestdataLayer.setOrgId(orgId);
+                    tTestdataLayer.setDataSource(dataSource2);
+                    tTestdataLayer.setLqId(testdataId);
+                    tTestdataLayerArrayList.add(tTestdataLayer);
 
-                Map<Integer, Map<Integer, Map<Integer, List<TPoints>>>> pointsS = points.stream().collect(Collectors.groupingBy(t -> Integer.parseInt(t.getZ()), Collectors.groupingBy(t -> Integer.parseInt(t.getY()), Collectors.groupingBy(t -> Integer.parseInt(t.getX())))));
-                for (Map.Entry<Integer, Map<Integer, Map<Integer, List<TPoints>>>> pS : pointsS.entrySet()) {
-                    //每层数据
-                    Integer keyL = pS.getKey();
-                    Map<Integer, Map<Integer, List<TPoints>>> layerPS = pS.getValue();
-                    for (Map.Entry<Integer, Map<Integer, List<TPoints>>> rows : layerPS.entrySet()) {
-                        //每一行数据
-                        Integer keyR = rows.getKey();
-                        Map<Integer, List<TPoints>> value = rows.getValue();
-                        for (Map.Entry<Integer, List<TPoints>> orws : value.entrySet()) {
-                            Integer keyC = orws.getKey();
-                            BigDecimal te = orws.getValue().get(INT_ZERO).getTemp().setScale(2, RoundingMode.HALF_UP);
-                            if (threshold != null && ilqYq.equals(STR_ZERO)) {
-                                boolean temp = false;
-                                BigDecimal threshold1 = threshold.getThreshold().setScale(2, RoundingMode.HALF_UP);
-                                //-1 小于 0 等于 1 大于
-                                if (te.compareTo(threshold1) == 1) {
-                                    // tid id,cfCdoe 仓房编码,threshold 报警实体包括orgID,tthreshold 检测值,wThreshold 预警或报警设置值,date 检测时间,desc 描述信息,mode 0测温，1测虫，2测气,warning 0报警，1预警
-                                    String tid = uuidUtils.getCode();
-                                    TWarningThresholdHistory tt = null;
-                                    StringBuffer desc = new StringBuffer();
-                                    if (!te.toString().equals(STR_TEMP00)) {
-                                        desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")高于阈值(").append(threshold1).append(")");
-                                        tt = warningMessage.saveWThreshold(tid, house, threshold, te, threshold1, time, desc.toString(), dataSource2, STR_ZERO, STR_ZERO);
-                                    } else {
-                                        String s = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列设备异常").toString();
-                                        tt = warningMessage.saveWThreshold(tid, house, threshold, te, threshold1, time, s, dataSource2, STR_ZERO, ConstUtils.STR_TWO);
-                                    }
-                                    tWarningThresholdHistorieList.add(tt);
-                                    temp = true;
-                                }
-                                if (wWarning != null && !temp && !te.toString().equals(STR_TEMP00)) {
+                    Map<Integer, Map<Integer, Map<Integer, List<TPoints>>>> pointsS = points.stream().collect(Collectors.groupingBy(t -> Integer.parseInt(t.getZ()), Collectors.groupingBy(t -> Integer.parseInt(t.getY()), Collectors.groupingBy(t -> Integer.parseInt(t.getX())))));
+                    for (Map.Entry<Integer, Map<Integer, Map<Integer, List<TPoints>>>> pS : pointsS.entrySet()) {
+                        //每层数据
+                        Integer keyL = pS.getKey();
+                        Map<Integer, Map<Integer, List<TPoints>>> layerPS = pS.getValue();
+                        for (Map.Entry<Integer, Map<Integer, List<TPoints>>> rows : layerPS.entrySet()) {
+                            //每一行数据
+                            Integer keyR = rows.getKey();
+                            Map<Integer, List<TPoints>> value = rows.getValue();
+                            for (Map.Entry<Integer, List<TPoints>> orws : value.entrySet()) {
+                                Integer keyC = orws.getKey();
+                                BigDecimal te = orws.getValue().get(INT_ZERO).getTemp().setScale(2, RoundingMode.HALF_UP);
+                                if (threshold != null && ilqYq.equals(STR_ZERO)) {
+                                    boolean temp = false;
+                                    BigDecimal threshold1 = threshold.getThreshold().setScale(2, RoundingMode.HALF_UP);
                                     //-1 小于 0 等于 1 大于
-                                    BigDecimal ww = wWarning.getThreshold();
-                                    BigDecimal subtract = threshold1.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
-                                    if (te.compareTo(subtract) == 1 && ilqYq.equals(STR_ZERO)) {
+                                    if (te.compareTo(threshold1) == 1) {
+                                        // tid id,cfCdoe 仓房编码,threshold 报警实体包括orgID,tthreshold 检测值,wThreshold 预警或报警设置值,date 检测时间,desc 描述信息,mode 0测温，1测虫，2测气,warning 0报警，1预警
                                         String tid = uuidUtils.getCode();
+                                        TWarningThresholdHistory tt = null;
                                         StringBuffer desc = new StringBuffer();
-                                        String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")高于阈值(").append(subtract).append(")").toString();
-                                        TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, subtract, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
+                                        if (!te.toString().equals(STR_TEMP00)) {
+                                            desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")高于阈值(").append(threshold1).append(")");
+                                            tt = warningMessage.saveWThreshold(tid, house, threshold, te, threshold1, time, desc.toString(), dataSource2, STR_ZERO, STR_ZERO);
+                                        } else {
+                                            String s = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列设备异常").toString();
+                                            tt = warningMessage.saveWThreshold(tid, house, threshold, te, threshold1, time, s, dataSource2, STR_ZERO, ConstUtils.STR_TWO);
+                                        }
                                         tWarningThresholdHistorieList.add(tt);
+                                        temp = true;
+                                    }
+                                    if (wWarning != null && !temp && !te.toString().equals(STR_TEMP00)) {
+                                        //-1 小于 0 等于 1 大于
+                                        BigDecimal ww = wWarning.getThreshold();
+                                        BigDecimal subtract = threshold1.subtract(ww).setScale(2, RoundingMode.HALF_UP); //高温减去阈值
+                                        if (te.compareTo(subtract) == 1 && ilqYq.equals(STR_ZERO)) {
+                                            String tid = uuidUtils.getCode();
+                                            StringBuffer desc = new StringBuffer();
+                                            String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")高于阈值(").append(subtract).append(")").toString();
+                                            TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, subtract, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
+                                            tWarningThresholdHistorieList.add(tt);
+                                        }
                                     }
                                 }
-                            }
-                            if (wLowest != null && ilqYq.equals(STR_ZERO)) {
-                                boolean temp = false;
-                                BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
-                                //-1 小于 0 等于 1 大于
-                                if (te.compareTo(wl) == -1 && !te.toString().equals(STR_TEMP00)) {
-                                    String tid = uuidUtils.getCode();
-                                    StringBuffer desc = new StringBuffer();
-                                    String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")低于阈值(").append(wl).append(")").toString();
-                                    TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, te, wl, time, str, dataSource2, STR_ZERO, STR_ZERO);
-                                    tWarningThresholdHistorieList.add(tt);
-                                    temp = true;
-                                }
-                                if (wWarning != null && !temp && !te.toString().equals(STR_TEMP00)) {
+                                if (wLowest != null && ilqYq.equals(STR_ZERO)) {
+                                    boolean temp = false;
+                                    BigDecimal wl = wLowest.getThreshold().setScale(2, RoundingMode.HALF_UP);
                                     //-1 小于 0 等于 1 大于
-                                    BigDecimal ww = wWarning.getThreshold();
-                                    BigDecimal wadd = wl.add(ww).setScale(2, RoundingMode.HALF_UP);//高温减去阈值
-                                    if (te.compareTo(wadd) == -1 && ilqYq.equals(STR_ZERO)) {
+                                    if (te.compareTo(wl) == -1 && !te.toString().equals(STR_TEMP00)) {
                                         String tid = uuidUtils.getCode();
                                         StringBuffer desc = new StringBuffer();
-                                        String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")低于阈值(").append(wadd).append(")").toString();
-                                        TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, wadd, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
+                                        String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")低于阈值(").append(wl).append(")").toString();
+                                        TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wLowest, te, wl, time, str, dataSource2, STR_ZERO, STR_ZERO);
                                         tWarningThresholdHistorieList.add(tt);
+                                        temp = true;
+                                    }
+                                    if (wWarning != null && !temp && !te.toString().equals(STR_TEMP00)) {
+                                        //-1 小于 0 等于 1 大于
+                                        BigDecimal ww = wWarning.getThreshold();
+                                        BigDecimal wadd = wl.add(ww).setScale(2, RoundingMode.HALF_UP);//高温减去阈值
+                                        if (te.compareTo(wadd) == -1 && ilqYq.equals(STR_ZERO)) {
+                                            String tid = uuidUtils.getCode();
+                                            StringBuffer desc = new StringBuffer();
+                                            String str = desc.append("第").append(keyL).append("层,第").append(keyR).append("行,第").append(keyC).append("列粮温(").append(te).append(")低于阈值(").append(wadd).append(")").toString();
+                                            TWarningThresholdHistory tt = warningMessage.saveWThreshold(tid, house, wWarning, te, wadd, time, str, dataSource2, STR_ZERO, ConstUtils.STR_ONE);
+                                            tWarningThresholdHistorieList.add(tt);
+                                        }
                                     }
                                 }
                             }
                         }
                     }
                 }
-            }
-        });
+            });
 
-        if (tTestdataList.size() > INT_ZERO) {
-            temperatureRecordService.insertBatch(tTestdataList);
-        }
-        if (tTestdataLayerArrayList.size() > INT_ZERO) {
-            tTestdataLayerMapper.insertBatch(tTestdataLayerArrayList);
-        }
-        if (tWarningThresholdHistorieList.size() > INT_ZERO) {
-            tWarningThresholdHistoryMapper.insertBatch(tWarningThresholdHistorieList);
+            if (tTestdataList.size() > INT_ZERO) {
+                temperatureRecordService.insertBatch(tTestdataList);
+            }
+            if (tTestdataLayerArrayList.size() > INT_ZERO) {
+                tTestdataLayerMapper.insertBatch(tTestdataLayerArrayList);
+            }
+            if (tWarningThresholdHistorieList.size() > INT_ZERO) {
+                tWarningThresholdHistoryMapper.insertBatch(tWarningThresholdHistorieList);
+            }
+            logger.info("测温数据入库成功2");
+        } catch (Exception e) {
+            logger.info("测温异常：" + e.getMessage());
         }
     }
 }