解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/WarningRecordStatusMessage.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.FanWarningRecordServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HealthStatusIndicatorServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.PvWarningRecordServiceImpl;
@@ -28,25 +29,21 @@ import java.util.stream.Collectors;
 @Slf4j
 public class WarningRecordStatusMessage extends EmqxListener {
 
-    @Autowired
-    protected EmqKeeper emqKeeper;
     /**
      * 预警状态修改消息 - 标准化
      */
-    public static final String WARNING_CHANGE_MESSAGE = "+/warning/change";
-
-
-    @Autowired
-    private FanWaringRecordMapper fanWaringRecordMapper;
-
+//    public static final String WARNING_CHANGE_MESSAGE = "+/warning/change";
+    public static final String WARNING_CHANGE_MESSAGE = "warningchangetest";
     @Autowired
-    private PvWaringRecordMapper pvWaringRecordMapper;
-
+    protected EmqKeeper emqKeeper;
     @Autowired
     FanWarningRecordServiceImpl fanWarningRecordService;
-
     @Autowired
     PvWarningRecordServiceImpl pvWarningRecordService;
+    @Autowired
+    private FanWaringRecordMapper fanWaringRecordMapper;
+    @Autowired
+    private PvWaringRecordMapper pvWaringRecordMapper;
 
     @PostConstruct
     void init() throws Exception {
@@ -71,7 +68,29 @@ public class WarningRecordStatusMessage extends EmqxListener {
     public void jxIopUpdateFan(JSONArray analysisResult) {
         log.info("修改预警状态信息：{}", analysisResult);
         List<JSONObject> taskList = JSONObject.parseArray(analysisResult.toJSONString(), JSONObject.class);
-        List<String> traceIds = taskList.stream().map(t -> t.get("extAttr1").toString()).collect(Collectors.toList());
+        taskList = taskList.stream().filter(t -> "2".equals(t.getString("processingStatus"))).collect(Collectors.toList());
+        taskList.stream().forEach(jsonObject -> {
+            String[] params = jsonObject.getString("extAttr1").split("@");
+            QueryWrapper<FanWarningRecord> queryWrapper =new QueryWrapper<>();
+            queryWrapper.eq("station",jsonObject.getString("sourceAttributionDesc"));
+            queryWrapper.eq("equipment_name",jsonObject.getString("objectName"));
+            queryWrapper.eq("point_name",jsonObject.getString("objectIndexValue"));
+            queryWrapper.eq("kks",jsonObject.getString("objectId"));
+            if(params.length==3){
+                queryWrapper.eq("sub_system",params[0]);
+                queryWrapper.eq("health_level",params[1]);
+                queryWrapper.eq("warning_period",params[2]);
+            }
+            List<FanWarningRecord> fanWarningRecords = fanWaringRecordMapper.selectList(queryWrapper);
+            fanWarningRecords.stream().forEach(fanWarningRecord -> {
+                fanWarningRecord.setDisposotionDate(DateUtil.now());
+                fanWarningRecord.setStatus("1");
+                fanWarningRecord.setDisposotionState("已确认");
+                fanWaringRecordMapper.insert(fanWarningRecord);
+            });
+        });
+
+//        List<String> traceIds = taskList.stream().map(t -> t.get("extAttr1").toString()).collect(Collectors.toList());
 //        LambdaUpdateWrapper<IdxBizFanWarningRecord> lambda = new LambdaUpdateWrapper<>();
 //        lambda.set(IdxBizFanWarningRecord::getDisposotionState, "已确认");
 //        lambda.set(IdxBizFanWarningRecord::getStatus, "1");
@@ -79,16 +98,19 @@ public class WarningRecordStatusMessage extends EmqxListener {
 //        lambda.in(IdxBizFanWarningRecord::getSequenceNbr, traceIds);
 //        idxBizFanWarningRecordService.update(lambda);
 
-        List<FanWarningRecord> list = new ArrayList<>();
-        for (String traceId : traceIds) {
-            FanWarningRecord fanWarningRecord = new FanWarningRecord();
-            fanWarningRecord.setTs(Long.valueOf(traceId));
-            fanWarningRecord.setDisposotionDate(DateUtil.now());
-            fanWarningRecord.setStatus("1");
-            fanWarningRecord.setDisposotionState("已确认");
-            list.add(fanWarningRecord);
-        }
-        fanWaringRecordMapper.updateStatusByTs(list);
+//        List<FanWarningRecord> list = new ArrayList<>();
+//        for (String traceId : traceIds) {
+//            FanWarningRecord fanWarningRecord = new FanWarningRecord();
+//            fanWarningRecord.setTs(Long.valueOf(traceId));
+//            fanWarningRecord.setDisposotionDate(DateUtil.now());
+//            fanWarningRecord.setStatus("1");
+//            fanWarningRecord.setDisposotionState("已确认");
+//            list.add(fanWarningRecord);
+//        }
+//        if(list.size()>0){
+//            log.info("XXXXXXXXXXXX风电修改预警状态XXXXXXXXXXXXXXXXXX",JSON.toJSONString(list));
+//            fanWaringRecordMapper.updateStatusByTs(list);
+//        }
 
     }
 
@@ -96,23 +118,48 @@ public class WarningRecordStatusMessage extends EmqxListener {
     public void jxIopUpdatePv(JSONArray analysisResult) {
         log.info("修改预警状态信息：{}", analysisResult);
         List<JSONObject> taskList = JSONObject.parseArray(analysisResult.toJSONString(), JSONObject.class);
-        List<String> traceIds = taskList.stream().map(t -> t.get("extAttr1").toString()).collect(Collectors.toList());
-//        LambdaUpdateWrapper<IdxBizPvWarningRecord> lambda = new LambdaUpdateWrapper<>();
-//        lambda.set(IdxBizPvWarningRecord::getDisposotionState, "已处置");
-//        lambda.set(IdxBizPvWarningRecord::getStatus, "1");
-//        lambda.set(IdxBizPvWarningRecord::getDisposotionDate, new Date());
-//        lambda.in(IdxBizPvWarningRecord::getSequenceNbr, traceIds);
-//        idxBizPvWarningRecordService.update(lambda);
-        // td
-        List<PvWarningRecord> list = new ArrayList<>();
-        for (String traceId : traceIds) {
-            PvWarningRecord pvWarningRecord = new PvWarningRecord();
-            pvWarningRecord.setTs(Long.valueOf(traceId));
+        taskList = taskList.stream().filter(t -> "2".equals(t.getString("processingStatus"))).collect(Collectors.toList());
+
+        taskList.stream().forEach(jsonObject -> {
+            String[] params = jsonObject.getString("extAttr1").split("@");
+            QueryWrapper<PvWarningRecord> queryWrapper =new QueryWrapper<>();
+            queryWrapper.eq("station",jsonObject.getString("sourceAttributionDesc"));
+            queryWrapper.eq("equipment_name",jsonObject.getString("objectName"));
+            queryWrapper.eq("point_name",jsonObject.getString("objectIndexValue"));
+            queryWrapper.eq("kks",jsonObject.getString("objectId"));
+            if(params.length==3){
+                queryWrapper.eq("subarray",params[0]);
+                queryWrapper.eq("health_level",params[1]);
+                queryWrapper.eq("warning_period",params[2]);
+            }
+            List<PvWarningRecord> pvWarningRecords = pvWaringRecordMapper.selectList(queryWrapper);
+            pvWarningRecords.stream().forEach(pvWarningRecord -> {
                 pvWarningRecord.setDisposotionDate(DateUtil.now());
                 pvWarningRecord.setStatus("1");
                 pvWarningRecord.setDisposotionState("已确认");
-            list.add(pvWarningRecord);
-        }
-        pvWaringRecordMapper.updateStatusByTs(list);
+                pvWaringRecordMapper.insert(pvWarningRecord);
+            });
+        });
+//        List<String> traceIds = taskList.stream().map(t -> t.get("extAttr1").toString()).collect(Collectors.toList());
+////        LambdaUpdateWrapper<IdxBizPvWarningRecord> lambda = new LambdaUpdateWrapper<>();
+////        lambda.set(IdxBizPvWarningRecord::getDisposotionState, "已处置");
+////        lambda.set(IdxBizPvWarningRecord::getStatus, "1");
+////        lambda.set(IdxBizPvWarningRecord::getDisposotionDate, new Date());
+////        lambda.in(IdxBizPvWarningRecord::getSequenceNbr, traceIds);
+////        idxBizPvWarningRecordService.update(lambda);
+//        // td
+//        List<PvWarningRecord> list = new ArrayList<>();
+//        for (String traceId : traceIds) {
+//            PvWarningRecord pvWarningRecord = new PvWarningRecord();
+//            pvWarningRecord.setTs(Long.valueOf(traceId));
+//            pvWarningRecord.setDisposotionDate(DateUtil.now());
+//            pvWarningRecord.setStatus("1");
+//            pvWarningRecord.setDisposotionState("已确认");
+//            list.add(pvWarningRecord);
+//        }
+//        if (list.size() > 0) {
+//            log.info("XXXXXXXXXXXX光伏修改预警状态XXXXXXXXXXXXXXXXXX", JSON.toJSONString(list));
+//            pvWaringRecordMapper.updateStatusByTs(list);
+//        }
     }
 }

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

@@ -211,10 +211,10 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
         for (int i = idxBizFanHealthIndexListSize - 1; i >= 0; i--) {
             HashMap<String, String> alarmAbnormalityItem = new HashMap<>();
             FanHealthIndex idxBizFanHealthIndex = idxBizFanHealthIndexList.get(i);
-            xDatas.add(idxBizFanHealthIndex.getAnalysisTime());
+            xDatas.add(idxBizFanHealthIndex.getRecDate());
             yDatas.add(Double.valueOf(keepOneKeepDecimalPlace(idxBizFanHealthIndex.getHealthIndex())));
             alarmAbnormalityItem.put("sort", String.valueOf(i));
-            alarmAbnormalityItem.put("time", idxBizFanHealthIndex.getAnalysisTime());
+            alarmAbnormalityItem.put("time", idxBizFanHealthIndex.getRecDate());
             alarmAbnormalityItem.put("abnormal", keepOneKeepDecimalPlace(idxBizFanHealthIndex.getAnomaly()));
             alarmAbnormalityItem.put("healthValue", keepOneKeepDecimalPlace(idxBizFanHealthIndex.getHealthIndex()));
             alarmAbnormalityList.add(alarmAbnormalityItem);
@@ -264,32 +264,32 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
         for (int i = idxBizPvHealthIndexList.size() - 1; i >= 0; i--) {
             HashMap<String, String> alarmAbnormalityItem = new HashMap<>();
             PvHealthIndex idxBizPvHealthIndex = idxBizPvHealthIndexList.get(i);
-            xDatas.add(idxBizPvHealthIndex.getAnalysisTime());
+            xDatas.add(idxBizPvHealthIndex.getRecDate());
             yDatas.add(Double.valueOf(keepOneKeepDecimalPlace(idxBizPvHealthIndex.getHealthIndex())));
             alarmAbnormalityItem.put("sort", String.valueOf(i));
-            alarmAbnormalityItem.put("time", idxBizPvHealthIndex.getAnalysisTime());
+            alarmAbnormalityItem.put("time", idxBizPvHealthIndex.getRecDate());
             alarmAbnormalityItem.put("abnormal", keepOneKeepDecimalPlace(idxBizPvHealthIndex.getAnomaly()));
             alarmAbnormalityItem.put("healthValue", keepOneKeepDecimalPlace(idxBizPvHealthIndex.getHealthIndex()));
             if (idxBizPvHealthIndexListSize >= 3) {
                 if (i == 0) {
-                    endTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, 5);
+                    endTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, 5);
                 }
                 if (i == 2) {
-                    startTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, -5);
+                    startTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, -5);
                 }
             }
             if (idxBizPvHealthIndexListSize == 2) {
                 if (i == 0) {
-                    endTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, 5);
+                    endTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, 5);
                 }
                 if (i == 1) {
-                    startTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, -5);
+                    startTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, -5);
                 }
             }
             if (idxBizPvHealthIndexListSize == 1) {
                 if (i == 0) {
-                    endTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, 5);
-                    startTime = handlerDateStr(idxBizPvHealthIndex.getAnalysisTime(), -8, -5);
+                    endTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, 5);
+                    startTime = handlerDateStr(idxBizPvHealthIndex.getRecDate(), -8, -5);
                 }
             }
             alarmAbnormalityList.add(alarmAbnormalityItem);
@@ -540,9 +540,21 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                     Double processValue1 = indicatorDataListMap.get(s + "_" + process1Address);
                     Double processValue2 = indicatorDataListMap.get(s + "_" + process2Address);
                     Double processValue3 = indicatorDataListMap.get(s + "_" + process3Address);
+                    if(ObjectUtils.isEmpty(analyseValue)){
+                        analyseValue=0.0;
+                    }
                     currentValueMap.put("analyseValue", keepOneKeepDecimalPlace(analyseValue));
+                    if(ObjectUtils.isEmpty(processValue1)){
+                        processValue1=0.0;
+                    }
                     currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1));
+                    if(ObjectUtils.isEmpty(processValue2)){
+                        processValue2=0.0;
+                    }
                     currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2));
+                    if(ObjectUtils.isEmpty(processValue3)){
+                        processValue3=0.0;
+                    }
                     currentValueMap.put("processValue3", keepOneKeepDecimalPlace(processValue3));
                     HashMap<String, String> trainValueMap = getWorkingConditionCombinationIntervalFan(processValue1, processValue2, processValue3, idxBizFanPointVarCentralValueList);
                     trainValueMap.put("time", s);
@@ -599,9 +611,21 @@ public class AlarmInfoDetailServiceImpl implements IAlarmInfoDetailService {
                     Double processValue1 = indicatorDataListMap.get(s + "_" + process1Address);
                     Double processValue2 = indicatorDataListMap.get(s + "_" + process2Address);
                     Double processValue3 = indicatorDataListMap.get(s + "_" + process3Address);
+                    if(ObjectUtils.isEmpty(analyseValue)){
+                        analyseValue = 0.0;
+                    }
                     currentValueMap.put("analyseValue", keepOneKeepDecimalPlace(analyseValue));
+                    if(ObjectUtils.isEmpty(processValue1)){
+                        processValue1 = 0.0;
+                    }
                     currentValueMap.put("processValue1", keepOneKeepDecimalPlace(processValue1));
+                    if(ObjectUtils.isEmpty(analyseValue)){
+                        processValue2 = 0.0;
+                    }
                     currentValueMap.put("processValue2", keepOneKeepDecimalPlace(processValue2));
+                    if(ObjectUtils.isEmpty(processValue3)){
+                        processValue3 = 0.0;
+                    }
                     currentValueMap.put("processValue3", keepOneKeepDecimalPlace(processValue3));
                     HashMap<String, String> trainValueMap = getWorkingConditionCombinationIntervalPv(processValue1, processValue2, processValue3, idxBizPvPointVarCentralValueList);
                     trainValueMap.put("time", s);

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

@@ -2030,7 +2030,7 @@ public class CommonServiceImpl {
             insertPvDataTDEngine(fanHealthIndices1, format, "按时刻");
         }
         try {
-            logger.info("--------------------response： " + response);
+//            logger.info("--------------------response： " + response);
             logger.info("------------------------------------------调用光伏健康指数计算算法结束----------------------------------------");
         } catch (Exception e) {
             throw new RuntimeException(e);

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/feign/McbWarningFeign.java

@@ -7,6 +7,8 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -85,19 +87,19 @@ public interface McbWarningFeign {
     /**
      * 跑马灯列表数据分页查询 
      */
-    @GetMapping("/monitor/overview/getLampListPage")
+    @GetMapping(value = "/monitor/overview/getLampListPage")
     FeignClientResult getLampListPage(@RequestParam String questionRectificationStatus,
                                              @RequestParam("codes") List<String> codes,
                                              @RequestParam(value = "operator", defaultValue = "=") String operator,
-                                             Page page);
+                                             @RequestParam Page page);
 
 
 
     /**
      * 跑马灯列表数据查询
      */
-    @GetMapping("/monitor/overview/getLampListList")
-    FeignClientResult getLampListList(@RequestParam String questionRectificationStatus,
+    @GetMapping("/monitor/overview/getLampList")
+    FeignClientResult getLampList(@RequestParam String questionRectificationStatus,
                                              @RequestParam("codes") List<String> codes,
                                              @RequestParam(value = "operator", defaultValue = "=") String operator);
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -510,7 +510,7 @@ public class MonitorFanIdxController extends BaseController {
         return ResponseHelper.buildResponse(resultsData);
     }
 
-    //    @Scheduled(cron = "0/15 * * * * ? ")
+    @Scheduled(cron = "0/15 * * * * ? ")
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "模拟量列表消息")
     @GetMapping("/getAnalogQuantityInfo")
@@ -521,7 +521,7 @@ public class MonitorFanIdxController extends BaseController {
         return CommonResponseUtil.success();
     }
 
-    //    @Scheduled(cron = "0/15 * * * * ? ")
+    @Scheduled(cron = "0/15 * * * * ? ")
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "升压站主屏消息接口")
     @GetMapping("/getMajorAnalogQuantityByPage")