""

hnls-scada/src/main/java/com/tofly/scada/service/impl/StatisticsScadaServiceImpl.java

@@ -571,9 +571,6 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
                     multiplyNumber = BigDecimal.valueOf(0.85).multiply(BigDecimal.valueOf(0.43));
                     break;
                 case "FT_A_8":
-//                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_23");
-//                    multiplyNumber = BigDecimal.valueOf(0.92).multiply(BigDecimal.valueOf(0.35));
-//                    break;
                     List<ScadaDeviceCodeVo> scadaDeviceCodeVos4 = scadaHistoryListByCode.get("FT_B_20");
                     List<ScadaDeviceCodeVo> scadaDeviceCodeVos5 = scadaHistoryListByCode.get("FT_B_4");
                     scadaDeviceCodeVos4.forEach(scadaDeviceCodeVo -> {
@@ -656,60 +653,57 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_6");
                     multiplyNumber = BigDecimal.valueOf(0.88);
                     break;
-                case "FT_A_12":
-                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_6");
-                    multiplyNumber = BigDecimal.valueOf(0.12).multiply(BigDecimal.valueOf(0.88)).multiply(BigDecimal.valueOf(0.88));
-                    break;
+//                case "FT_A_12":
+//                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_6");
+//                    multiplyNumber = BigDecimal.valueOf(0.12).multiply(BigDecimal.valueOf(0.88)).multiply(BigDecimal.valueOf(0.88));
+//                    break;
                 case "FT_A_16":
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_17");
                     multiplyNumber = BigDecimal.valueOf(0.72);
                     break;
-                case "FT_A_20":
-                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_19");
-                    multiplyNumber = BigDecimal.valueOf(0.43);
-                    break;
-                case "FT_A_21":
-                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_19");
-                    multiplyNumber = BigDecimal.valueOf(0.39);
-                    break;
-                case "FT_A_22":
-//                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_23");
-//                    multiplyNumber = BigDecimal.valueOf(0.92);
+//                case "FT_A_20":
+//                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_19");
+//                    multiplyNumber = BigDecimal.valueOf(0.43);
 //                    break;
-                    List<ScadaDeviceCodeVo> scadaDeviceCodeVos6 = scadaHistoryListByCode.get("FT_B_20");
-                    List<ScadaDeviceCodeVo> scadaDeviceCodeVos7 = scadaHistoryListByCode.get("FT_B_4");
-                    scadaDeviceCodeVos6.forEach(scadaDeviceCodeVo -> {
-                        List<Map<String, Object>> indexCodes = v.stream().filter(e -> String.valueOf(e.get("type")).equals(scadaDeviceCodeVo.getIndexType())).collect(Collectors.toList());
-                        if (CollUtil.isEmpty(indexCodes)) {
-                            return;
-                        }
-                        List<ScadaDeviceCodeVo> scadaDeviceCodeVos7Final = scadaDeviceCodeVos7.stream()
-                                .filter(e -> e.getIndexType().equals(scadaDeviceCodeVo.getIndexType())
-                                        && DateUtil.format(e.getScadaTime(), "yyyyMMddHHmm").equals(DateUtil.format(scadaDeviceCodeVo.getScadaTime(), "yyyyMMddHHmm")))
-                                .collect(Collectors.toList());
-                        String indexCode = String.valueOf(indexCodes.get(0).get("indexCode"));
-                        Scada scada = new Scada();
-                        ScadaMonitor scadaMonitor = new ScadaMonitor();
-                        scada.setCode(indexCode);
-                        scadaMonitor.setCode(indexCode);
-                        scada.setValue(new BigDecimal(scadaDeviceCodeVo.getValue())
-                                .add(CollUtil.isEmpty(scadaDeviceCodeVos7Final) ? BigDecimal.ZERO:new BigDecimal(scadaDeviceCodeVos7Final.get(0).getValue()))
-                                .multiply(BigDecimal.valueOf(1.6))
-                                .setScale(2,RoundingMode.HALF_UP)
-                                .toString());
-                        scadaMonitor.setValue(new BigDecimal(scadaDeviceCodeVo.getValue())
-                                .add(CollUtil.isEmpty(scadaDeviceCodeVos7Final) ? BigDecimal.ZERO:new BigDecimal(scadaDeviceCodeVos7Final.get(0).getValue()))
-                                .multiply(BigDecimal.valueOf(1.6))
-                                .setScale(2,RoundingMode.HALF_UP)
-                                .toString());
-                        scada.setScadaTime(scadaDeviceCodeVo.getScadaTime());
-                        scadaMonitor.setScadaTime(scadaDeviceCodeVo.getScadaTime());
-                        scada.setUpdateTime(new Date());
-                        scadaMonitor.setUpdateTime(new Date());
-                        monitorList.add(scada);
-                        finalRealTimeList.add(scadaMonitor);
-                    });
-                    return;
+//                case "FT_A_21":
+//                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_19");
+//                    multiplyNumber = BigDecimal.valueOf(0.39);
+//                    break;
+//                case "FT_A_22":
+//                    List<ScadaDeviceCodeVo> scadaDeviceCodeVos6 = scadaHistoryListByCode.get("FT_B_20");
+//                    List<ScadaDeviceCodeVo> scadaDeviceCodeVos7 = scadaHistoryListByCode.get("FT_B_4");
+//                    scadaDeviceCodeVos6.forEach(scadaDeviceCodeVo -> {
+//                        List<Map<String, Object>> indexCodes = v.stream().filter(e -> String.valueOf(e.get("type")).equals(scadaDeviceCodeVo.getIndexType())).collect(Collectors.toList());
+//                        if (CollUtil.isEmpty(indexCodes)) {
+//                            return;
+//                        }
+//                        List<ScadaDeviceCodeVo> scadaDeviceCodeVos7Final = scadaDeviceCodeVos7.stream()
+//                                .filter(e -> e.getIndexType().equals(scadaDeviceCodeVo.getIndexType())
+//                                        && DateUtil.format(e.getScadaTime(), "yyyyMMddHHmm").equals(DateUtil.format(scadaDeviceCodeVo.getScadaTime(), "yyyyMMddHHmm")))
+//                                .collect(Collectors.toList());
+//                        String indexCode = String.valueOf(indexCodes.get(0).get("indexCode"));
+//                        Scada scada = new Scada();
+//                        ScadaMonitor scadaMonitor = new ScadaMonitor();
+//                        scada.setCode(indexCode);
+//                        scadaMonitor.setCode(indexCode);
+//                        scada.setValue(new BigDecimal(scadaDeviceCodeVo.getValue())
+//                                .add(CollUtil.isEmpty(scadaDeviceCodeVos7Final) ? BigDecimal.ZERO:new BigDecimal(scadaDeviceCodeVos7Final.get(0).getValue()))
+//                                .multiply(BigDecimal.valueOf(1.6))
+//                                .setScale(2,RoundingMode.HALF_UP)
+//                                .toString());
+//                        scadaMonitor.setValue(new BigDecimal(scadaDeviceCodeVo.getValue())
+//                                .add(CollUtil.isEmpty(scadaDeviceCodeVos7Final) ? BigDecimal.ZERO:new BigDecimal(scadaDeviceCodeVos7Final.get(0).getValue()))
+//                                .multiply(BigDecimal.valueOf(1.6))
+//                                .setScale(2,RoundingMode.HALF_UP)
+//                                .toString());
+//                        scada.setScadaTime(scadaDeviceCodeVo.getScadaTime());
+//                        scadaMonitor.setScadaTime(scadaDeviceCodeVo.getScadaTime());
+//                        scada.setUpdateTime(new Date());
+//                        scadaMonitor.setUpdateTime(new Date());
+//                        monitorList.add(scada);
+//                        finalRealTimeList.add(scadaMonitor);
+//                    });
+//                    return;
                 case "FT_A_24":
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_19");
                     multiplyNumber = BigDecimal.valueOf(0.93).multiply(BigDecimal.valueOf(0.39));
@@ -754,18 +748,4 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
         realTimeList = realTimeList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(ScadaMonitor::getCode))), ArrayList::new));
         realTimeList.forEach(info -> scadaMonitorService.update(info, new QueryWrapper<ScadaMonitor>().lambda().eq(ScadaMonitor::getCode, info.getCode())));
     }
-
-//    private List<Date> getFiveIntervalDates(Date startTime, Date endTime) {
-//        List<Date> res = new ArrayList<>();
-//        res.add(startTime);
-//
-//        Calendar calendar = Calendar.getInstance();
-//        calendar.setTime(startTime);
-//        while (calendar.getTime().compareTo(endTime) < 0) {
-//            calendar.add(Calendar.MINUTE, +5);
-//            res.add(calendar.getTime());
-//        }
-//        res.remove(res.size() -1);
-//        return res;
-//    }
 }