修改沙坪坝水厂二级高压组织，3号流量计采集标签,取消和尚山水厂0点水量处理

src/main/java/com/shkpr/service/aimodelpower/bizmgr/KprAimTapWaterBizFun.java

@@ -544,7 +544,7 @@ public class KprAimTapWaterBizFun {
             }
             if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("SS.SSCOM.F36:2".equals(tagTag) ||
                     "SS.SSCOM.F36:5".equals(tagTag) ||
-                    "OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(tagTag))) {
+                    "SS.SSCOM.F36:8".equals(tagTag))) {
                 Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
                         " WHERE TAG_CODE = '" + tagTag + "' " +
                                 " and QCQUISITION_TIME >= to_date('" + startDate + "', 'yyyy-mm-dd hh24:mi:ss')" +
@@ -644,27 +644,27 @@ public class KprAimTapWaterBizFun {
                                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                                     // 解析字符串以创建 LocalDateTime 实例
                                     LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
-                                    if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("SS.SSCOM.F36:2".equals(item.get("collcation_tag").toString()) ||
-                                            "SS.SSCOM.F36:5".equals(item.get("collcation_tag").toString()) ||
-                                            "OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
-                                        Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
-                                                " WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
-                                                        " and QCQUISITION_TIME >= to_date('" + startDate + "', 'yyyy-mm-dd hh24:mi:ss')" +
-                                                        " and QCQUISITION_TIME < to_date('" + endDate + "', 'yyyy-mm-dd hh24:mi:ss')");
-                                        if(itemCount!=null&&itemCount>0) {
-                                            List<Map<String, Object>> tapWaterHistoryList = getWaterTapWaterApi().getPageZILAISHUI_HISTORY2(itemCount, 0,
-                                                    " AND TAG_CODE = '" + item.get("collcation_tag") + "' " +
-                                                            " and QCQUISITION_TIME >= to_date('" + startTime + "', 'yyyy-mm-dd hh24:mi:ss')" +
-                                                            " and QCQUISITION_TIME < to_date('" + endTime + "', 'yyyy-mm-dd hh24:mi:ss')" +
-                                                            " order by QCQUISITION_TIME");
-                                            if (!CollectionUtils.isEmpty(tapWaterHistoryList) && tapWaterHistoryList.size() > 1) {
-                                                if (value == null) {
-                                                    value = 0.00;
-                                                }
-                                                value += tapWaterHistoryList.get((tapWaterHistoryList.size() - 1)).get("VAL") != null ? Double.valueOf(tapWaterHistoryList.get((tapWaterHistoryList.size() - 1)).get("val").toString()) : null;
-                                            }
-                                        }
-                                    }else {
+//                                    if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("SS.SSCOM.F36:2".equals(item.get("collcation_tag").toString()) ||
+//                                            "SS.SSCOM.F36:5".equals(item.get("collcation_tag").toString()) ||
+//                                            "SS.SSCOM.F36:8".equals(item.get("collcation_tag").toString()))) {
+//                                        Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
+//                                                " WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
+//                                                        " and QCQUISITION_TIME >= to_date('" + startDate + "', 'yyyy-mm-dd hh24:mi:ss')" +
+//                                                        " and QCQUISITION_TIME < to_date('" + endDate + "', 'yyyy-mm-dd hh24:mi:ss')");
+//                                        if(itemCount!=null&&itemCount>0) {
+//                                            List<Map<String, Object>> tapWaterHistoryList = getWaterTapWaterApi().getPageZILAISHUI_HISTORY2(itemCount, 0,
+//                                                    " AND TAG_CODE = '" + item.get("collcation_tag") + "' " +
+//                                                            " and QCQUISITION_TIME >= to_date('" + startTime + "', 'yyyy-mm-dd hh24:mi:ss')" +
+//                                                            " and QCQUISITION_TIME < to_date('" + endTime + "', 'yyyy-mm-dd hh24:mi:ss')" +
+//                                                            " order by QCQUISITION_TIME");
+//                                            if (!CollectionUtils.isEmpty(tapWaterHistoryList) && tapWaterHistoryList.size() > 1) {
+//                                                if (value == null) {
+//                                                    value = 0.00;
+//                                                }
+//                                                value += tapWaterHistoryList.get((tapWaterHistoryList.size() - 1)).get("VAL") != null ? Double.valueOf(tapWaterHistoryList.get((tapWaterHistoryList.size() - 1)).get("val").toString()) : null;
+//                                            }
+//                                        }
+//                                    }else {
                                         Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
                                                 " WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
                                                         " and QCQUISITION_TIME >= to_date('" + startDate + "', 'yyyy-mm-dd hh24:mi:ss')" +
@@ -688,7 +688,7 @@ public class KprAimTapWaterBizFun {
                                                 }
                                             }
                                         }
-                                    }
+//                                    }
                                 }
                                 recordAllEntity.put("value", value);
                                 List<Map<String, Object>> queryWaterRecord = getWaterTapWaterApi().getWaterCollectionRecordAllListNew(1, 0,
@@ -793,7 +793,7 @@ public class KprAimTapWaterBizFun {
                                     LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
                                     if (dateTime.getHour()==1&&("SS.SSCOM.F36:2".equals(item.get("collcation_tag").toString()) ||
                                             "SS.SSCOM.F36:5".equals(item.get("collcation_tag").toString()) ||
-                                            "OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
+                                            "SS.SSCOM.F36:8".equals(item.get("collcation_tag").toString()))) {
                                         Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
                                                 " WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
                                                         " and QCQUISITION_TIME >= to_date('" + startDate + "', 'yyyy-mm-dd hh24:mi:ss')" +
@@ -1137,27 +1137,27 @@ public class KprAimTapWaterBizFun {
                                                         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                                                         // 解析字符串以创建 LocalDateTime 实例
                                                         LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
-                                                        if (dateTime.getHour()==1&&("SS.SSCOM.F36:2".equals(item.get("collcation_tag").toString()) ||
-                                                                "SS.SSCOM.F36:5".equals(item.get("collcation_tag").toString()) ||
-                                                                "OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
-                                                            Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
-                                                                    " WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
-                                                                            " and QCQUISITION_TIME >= to_date('" + startDate + "', 'yyyy-mm-dd hh24:mi:ss')" +
-                                                                            " and QCQUISITION_TIME < to_date('" + endDate + "', 'yyyy-mm-dd hh24:mi:ss')");
-                                                            if(itemCount!=null&&itemCount>0) {
-                                                                List<Map<String, Object>> tapWaterHistoryList = getWaterTapWaterApi().getPageZILAISHUI_HISTORY2(itemCount, 0,
-                                                                        " AND TAG_CODE = '" + item.get("collcation_tag") + "' " +
-                                                                                " and QCQUISITION_TIME >= to_date('" + startTime + "', 'yyyy-mm-dd hh24:mi:ss')" +
-                                                                                " and QCQUISITION_TIME < to_date('" + endTime + "', 'yyyy-mm-dd hh24:mi:ss')" +
-                                                                                " order by QCQUISITION_TIME");
-                                                                if (!CollectionUtils.isEmpty(tapWaterHistoryList) && tapWaterHistoryList.size() > 1) {
-                                                                    if (value == null) {
-                                                                        value = 0.00;
-                                                                    }
-                                                                    value += tapWaterHistoryList.get((tapWaterHistoryList.size() - 1)).get("VAL") != null ? Double.valueOf(tapWaterHistoryList.get((tapWaterHistoryList.size() - 1)).get("val").toString()) : null;
-                                                                }
-                                                            }
-                                                        }else {
+//                                                        if (dateTime.getHour()==1&&("SS.SSCOM.F36:2".equals(item.get("collcation_tag").toString()) ||
+//                                                                "SS.SSCOM.F36:5".equals(item.get("collcation_tag").toString()) ||
+//                                                                "SS.SSCOM.F36:8".equals(item.get("collcation_tag").toString()))) {
+//                                                            Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
+//                                                                    " WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
+//                                                                            " and QCQUISITION_TIME >= to_date('" + startDate + "', 'yyyy-mm-dd hh24:mi:ss')" +
+//                                                                            " and QCQUISITION_TIME < to_date('" + endDate + "', 'yyyy-mm-dd hh24:mi:ss')");
+//                                                            if(itemCount!=null&&itemCount>0) {
+//                                                                List<Map<String, Object>> tapWaterHistoryList = getWaterTapWaterApi().getPageZILAISHUI_HISTORY2(itemCount, 0,
+//                                                                        " AND TAG_CODE = '" + item.get("collcation_tag") + "' " +
+//                                                                                " and QCQUISITION_TIME >= to_date('" + startTime + "', 'yyyy-mm-dd hh24:mi:ss')" +
+//                                                                                " and QCQUISITION_TIME < to_date('" + endTime + "', 'yyyy-mm-dd hh24:mi:ss')" +
+//                                                                                " order by QCQUISITION_TIME");
+//                                                                if (!CollectionUtils.isEmpty(tapWaterHistoryList) && tapWaterHistoryList.size() > 1) {
+//                                                                    if (value == null) {
+//                                                                        value = 0.00;
+//                                                                    }
+//                                                                    value += tapWaterHistoryList.get((tapWaterHistoryList.size() - 1)).get("VAL") != null ? Double.valueOf(tapWaterHistoryList.get((tapWaterHistoryList.size() - 1)).get("val").toString()) : null;
+//                                                                }
+//                                                            }
+//                                                        }else {
                                                             Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
                                                                     " WHERE TAG_CODE = '" + item.get("collcation_tag") + "' " +
                                                                             " and QCQUISITION_TIME >= to_date('" + startDate + "', 'yyyy-mm-dd hh24:mi:ss')" +
@@ -1181,7 +1181,7 @@ public class KprAimTapWaterBizFun {
                                                                     }
                                                                 }
                                                             }
-                                                        }
+//                                                        }
                                                     }
                                                     recordAllEntity.put("value", value);
                                                     List<Map<String, Object>> queryWaterRecord = getWaterTapWaterApi().getWaterCollectionRecordAllList(1, 0,