bug修改

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java

@@ -217,13 +217,15 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
                     idxBizPvWarningRecord.setHealthLevel(idxBizPvHealthIndices.get(0).getHealthLevel());
                     idxBizPvWarningRecordList.add(idxBizPvWarningRecord);
-                    // 触发风险模型生成预警处置模块的预警记录
-                    fetchDataPv(idxBizPvWarningRecord);
+
                    // idxBizPvWarningRecordMapper.insert(idxBizPvWarningRecord);
                 }
             }
         }
         idxBizPvWarningRecordService.saveBatch(idxBizPvWarningRecordList);
+        // 触发风险模型生成预警处置模块的预警记录
+        fetchDataPv(idxBizPvWarningRecordList);
+
     }
 
     /***
@@ -349,13 +351,13 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
                     idxBizPvWarningRecord.setHealthLevel(idxBizPvHealthIndices.get(0).getHealthLevel());
                     idxBizPvWarningRecordList.add(idxBizPvWarningRecord);
-                    // 触发风险模型生成预警处置模块的预警记录
-                    fetchDataPv(idxBizPvWarningRecord);
                     //idxBizPvWarningRecordMapper.insert(idxBizPvWarningRecord);
                 }
             }
         }
         idxBizPvWarningRecordService.saveBatch(idxBizPvWarningRecordList);
+        // 触发风险模型生成预警处置模块的预警记录
+        fetchDataPv(idxBizPvWarningRecordList);
     }
 
     /***
@@ -477,13 +479,13 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizPvWarningRecord.setHealthIndexSeq(idxBizPvHealthIndices.get(0).getHealthIndex().toString());
                     idxBizPvWarningRecord.setHealthLevel(idxBizPvHealthIndices.get(0).getHealthLevel());
                     idxBizPvWarningRecordList.add(idxBizPvWarningRecord);
-                    // 触发风险模型生成预警处置模块的预警记录
-                    fetchDataPv(idxBizPvWarningRecord);
                     //idxBizPvWarningRecordMapper.insert(idxBizPvWarningRecord);
                 }
             }
         }
         idxBizPvWarningRecordService.saveBatch(idxBizPvWarningRecordList);
+        // 触发风险模型生成预警处置模块的预警记录
+        fetchDataPv(idxBizPvWarningRecordList);
     }
 
 
@@ -609,13 +611,13 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setHealthIndexSeq(idxBizFanHealthIndices.get(0).getHealthIndex().toString());
                     idxBizFanWarningRecord.setHealthLevel(idxBizFanHealthIndices.get(0).getHealthLevel());
                     idxBizFanWarningRecordList.add(idxBizFanWarningRecord);
-                    // 触发风险模型生成预警处置模块的预警记录
-                    fetchDataFan(idxBizFanWarningRecord);
                     //idxBizFanWarningRecordMapper.insert(idxBizFanWarningRecord);
                 }
             }
         }
         idxBizFanWarningRecordService.saveBatch(idxBizFanWarningRecordList);
+        // 触发风险模型生成预警处置模块的预警记录
+        fetchDataFan(idxBizFanWarningRecordList);
     }
 
     /***
@@ -738,13 +740,12 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setHealthLevel(idxBizFanHealthIndices.get(0).getHealthLevel());
                     idxBizFanWarningRecord.setPointName(idxBizFanHealthIndices.get(0).getPointName());
                     idxBizFanWarningRecordList.add(idxBizFanWarningRecord);
-                    // 触发风险模型生成预警处置模块的预警记录
-                    fetchDataFan(idxBizFanWarningRecord);
-
                 }
             }
         }
         idxBizFanWarningRecordService.saveBatch(idxBizFanWarningRecordList);
+        // 触发风险模型生成预警处置模块的预警记录
+        fetchDataFan(idxBizFanWarningRecordList);
     }
 
     /***
@@ -870,24 +871,24 @@ public class HealthStatusIndicatorServiceImpl {
                     idxBizFanWarningRecord.setHealthLevel(idxBizFanHealthIndices.get(0).getHealthLevel());
                     idxBizFanWarningRecord.setPointName(idxBizFanHealthIndices.get(0).getPointName());
                     idxBizFanWarningRecordList.add(idxBizFanWarningRecord);
-                    // 触发风险模型生成预警处置模块的预警记录
-                    fetchDataFan(idxBizFanWarningRecord);
                 }
             }
         }
 
         idxBizFanWarningRecordService.saveBatch(idxBizFanWarningRecordList);
+        // 触发风险模型生成预警处置模块的预警记录
+        fetchDataFan(idxBizFanWarningRecordList);
     }
 
 
     /**
      * 光伏 - 触发预控模型生成预警
-     * @param idxBizPvWarningRecord
+     * @param idxBizPvWarningRecords
      * @return
      */
     @Async
-    public void fetchDataPv(IdxBizPvWarningRecord idxBizPvWarningRecord) {
-
+    public void fetchDataPv(List<IdxBizPvWarningRecord> idxBizPvWarningRecords) {
+        idxBizPvWarningRecords.stream().forEach(idxBizPvWarningRecord -> {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(INDEX_KEY_PV);
             bizMessage.setIndexValue(idxBizPvWarningRecord.getPointName());
@@ -913,18 +914,18 @@ public class HealthStatusIndicatorServiceImpl {
             } catch (MqttException e) {
                 e.printStackTrace();
             }
-
+        });
     }
 
 
     /**
      * 风电 - 触发预控模型生成预警
-     * @param idxBizFanWarningRecord
+     * @param idxBizFanWarningRecords
      * @return
      */
     @Async
-    public void fetchDataFan(IdxBizFanWarningRecord idxBizFanWarningRecord) {
-
+    public void fetchDataFan(List<IdxBizFanWarningRecord> idxBizFanWarningRecords) {
+        idxBizFanWarningRecords.stream().forEach(idxBizFanWarningRecord -> {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(String.format(INDEX_KEY_FAN, idxBizFanWarningRecord.getNumber()));
             bizMessage.setIndexValue(idxBizFanWarningRecord.getPointName());
@@ -950,6 +951,7 @@ public class HealthStatusIndicatorServiceImpl {
             } catch (MqttException e) {
                 e.printStackTrace();
             }
+        });
     }