预警相关bug

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

@@ -88,7 +88,7 @@ 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("traceId").toString()).collect(Collectors.toList());
+        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");
@@ -101,7 +101,7 @@ 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("traceId").toString()).collect(Collectors.toList());
+        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");

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

@@ -958,7 +958,7 @@ public class HealthStatusIndicatorServiceImpl {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(INDEX_KEY_PV);
             bizMessage.setIndexValue(idxBizPvWarningRecord.getPointName());
-            bizMessage.setTraceId(idxBizPvWarningRecord.getSequenceNbr());
+//            bizMessage.setTraceId(idxBizPvWarningRecord.getSequenceNbr());
             RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
             riskBizInfoVo.setWarningObjectName(idxBizPvWarningRecord.getEquipmentName());
             riskBizInfoVo.setWarningObjectCode(idxBizPvWarningRecord.getKks());
@@ -971,6 +971,7 @@ public class HealthStatusIndicatorServiceImpl {
             detailsVos.add(dynamicDetailsVo);
             riskBizInfoVo.setDynamicDetails(detailsVos);
             bizMessage.setBizInfo(riskBizInfoVo);
+            bizMessage.setTraceId2(idxBizPvWarningRecord.getSequenceNbr());
             try {
                 emqKeeper.getMqttClient().publish(SMART_ANALYSE_PV + "/data/analysis", JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
             } catch (MqttException e) {
@@ -992,7 +993,7 @@ public class HealthStatusIndicatorServiceImpl {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(String.format(INDEX_KEY_FAN, idxBizFanWarningRecord.getNumber()));
             bizMessage.setIndexValue(idxBizFanWarningRecord.getPointName());
-            bizMessage.setTraceId(idxBizFanWarningRecord.getSequenceNbr());
+//            bizMessage.setTraceId(idxBizFanWarningRecord.getSequenceNbr());
             RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
             riskBizInfoVo.setWarningObjectName(idxBizFanWarningRecord.getEquipmentName());
             riskBizInfoVo.setWarningObjectCode(idxBizFanWarningRecord.getKks());
@@ -1005,6 +1006,7 @@ public class HealthStatusIndicatorServiceImpl {
             detailsVos.add(dynamicDetailsVo);
             riskBizInfoVo.setDynamicDetails(detailsVos);
             bizMessage.setBizInfo(riskBizInfoVo);
+            bizMessage.setTraceId2(idxBizFanWarningRecord.getSequenceNbr());
             try {
                 emqKeeper.getMqttClient().publish(SMART_ANALYSE_FAN + "/data/analysis", JSON.toJSONString(bizMessage).getBytes(StandardCharsets.UTF_8), 2, false);
             } catch (MqttException e) {

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanHealthIndexMapper.xml

@@ -141,6 +141,7 @@
         count(1) as num
     FROM
         ${tableName} a
+        where a.DISPOSOTION_STATE == '未处置'
     group by ARAE,
              WARNING_NAME
     </select>

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/BizMessage.java

@@ -22,4 +22,5 @@ public class BizMessage {
      * 数据来源：实时数据、周期数据
      */
     String dataSource;
+    private String traceId2;
 }