"异常点位模拟"

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

@@ -538,16 +538,16 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
             BigDecimal instantaneousFlowMultiplyNumber = BigDecimal.ZERO;
             BigDecimal cumflowMultiplyNumber = BigDecimal.ZERO;
             switch (k) {
-                case "FT_B_15":
-                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_17");
-                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.21);
-                    cumflowMultiplyNumber = BigDecimal.valueOf(0.21);
-                    break;
                 case "FT_A_3":
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_20");
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.85);
                     cumflowMultiplyNumber = BigDecimal.valueOf(0.85);
                     break;
+                case "FT_A_7":
+                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_B_22");
+                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(1.32);
+                    cumflowMultiplyNumber = BigDecimal.valueOf(1.29);
+                    break;
                 case "FT_A_8":
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_22");
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.29);
@@ -603,11 +603,26 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.78);
                     cumflowMultiplyNumber = BigDecimal.valueOf(0.75);
                     break;
+                case "FT_A_11":
+                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_6");
+                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.32);
+                    cumflowMultiplyNumber = BigDecimal.valueOf(0.31);
+                    break;
+                case "FT_A_14":
+                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_17");
+                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.11);
+                    cumflowMultiplyNumber = BigDecimal.valueOf(0.09);
+                    break;
                 case "FT_A_16":
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_17");
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.72);
                     cumflowMultiplyNumber = BigDecimal.valueOf(0.72);
                     break;
+//                case "FT_A_21":
+//                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_19");
+//                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.39);
+//                    cumflowMultiplyNumber = BigDecimal.valueOf(0.39);
+//                    break;
                 case "FT_A_24":
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_19");
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.93).multiply(BigDecimal.valueOf(0.39));
@@ -618,16 +633,21 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.58);
                     cumflowMultiplyNumber = BigDecimal.valueOf(0.57);
                     break;
-                case "FT_B_3":
-                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_22");
-                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.04);
-                    cumflowMultiplyNumber = BigDecimal.valueOf(0.03);
-                    break;
+//                case "FT_B_3":
+//                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_22");
+//                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.04);
+//                    cumflowMultiplyNumber = BigDecimal.valueOf(0.03);
+//                    break;
                 case "FT_B_5":
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_22");
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.05);
                     cumflowMultiplyNumber = BigDecimal.valueOf(0.04);
                     break;
+                case "FT_B_15":
+                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_17");
+                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.21);
+                    cumflowMultiplyNumber = BigDecimal.valueOf(0.21);
+                    break;
                 case "FT_B_20":
                     scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_22");
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.18);
@@ -638,16 +658,6 @@ public class StatisticsScadaServiceImpl extends ServiceImpl<StatisticsScadaMappe
                     instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.71);
                     cumflowMultiplyNumber = BigDecimal.valueOf(0.69);
                     break;
-                case "FT_A_11":
-                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_6");
-                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.32);
-                    cumflowMultiplyNumber = BigDecimal.valueOf(0.31);
-                    break;
-                case "FT_A_21":
-                    scadaDeviceCodeVos = scadaHistoryListByCode.get("FT_A_19");
-                    instantaneousFlowMultiplyNumber = BigDecimal.valueOf(0.39);
-                    cumflowMultiplyNumber = BigDecimal.valueOf(0.39);
-                    break;
             }
             if (CollUtil.isEmpty(scadaDeviceCodeVos)) {
                 return;

hnls-scada/hnls-scada-boot/src/main/resources/mapper/StatisticsScadaMapper.xml

@@ -132,7 +132,7 @@
                 LEFT JOIN TF_DEVICE_ARCHIVE_MANAGE b ON a.DEVICE_ID = b.ID
         WHERE
             1 = 1
-          AND b.CODE IN ('FT_B_15', 'FT_A_3', 'FT_A_8', 'FT_A_9', 'FT_A_10', 'FT_A_16', 'FT_A_24', 'FT_A_25',
+          AND b.CODE IN ('FT_B_15', 'FT_A_3', 'FT_A_7', 'FT_A_8', 'FT_A_9', 'FT_A_10', 'FT_A_14', 'FT_A_16', 'FT_A_24', 'FT_A_25',
                          'FT_B_3', 'FT_B_5', 'FT_B_20', 'FT_B_31', 'FT_A_11', 'FT_A_21')
           AND a.TYPE IN ('13','17','19')
     </select>