bug修改

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

@@ -71,14 +71,14 @@ public class WarningRecordStatusMessage extends EmqxListener {
 
     public void jxIopUpdate(JSONObject analysisResult) {
         log.info("修改预警状态信息：{}", analysisResult);
-        if (ObjectUtils.isNotEmpty(analysisResult) && analysisResult.get("warningObjectType").toString().equals("pv")) {
+        if (ObjectUtils.isNotEmpty(analysisResult) && analysisResult.get("warningObjectType").toString().equals("fan")) {
             LambdaUpdateWrapper<IdxBizFanWarningRecord> lambda = new LambdaUpdateWrapper<>();
             lambda.set(IdxBizFanWarningRecord::getDisposotionState, "已处置");
             lambda.set(IdxBizFanWarningRecord::getStatus, "1");
             lambda.set(IdxBizFanWarningRecord::getDisposotionDate, new Date());
             lambda.eq(IdxBizFanWarningRecord::getSequenceNbr, analysisResult.get("objectId"));
             idxBizFanWarningRecordService.update(lambda);
-        } else if (ObjectUtils.isNotEmpty(analysisResult) && analysisResult.get("warningObjectType").toString().equals("fan")) {
+        } else if (ObjectUtils.isNotEmpty(analysisResult) && analysisResult.get("warningObjectType").toString().equals("pv")) {
             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/emqx/WarningRecordStatusMessage2.java

@@ -77,7 +77,7 @@ public class WarningRecordStatusMessage2 extends EmqxListener {
 
     public void jxIopUpdate(JSONObject analysisResult) {
         log.info("修改预警状态信息：{}", analysisResult);
-        if (ObjectUtils.isNotEmpty(analysisResult) && analysisResult.get("warningObjectType").toString().equals("pv")) {
+        if (ObjectUtils.isNotEmpty(analysisResult) && analysisResult.get("warningObjectType").toString().equals("fan")) {
             LambdaUpdateWrapper<IdxBizFanWarningRecord> lambda = new LambdaUpdateWrapper<>();
             lambda.set(IdxBizFanWarningRecord::getDisposotionState, "已处置");
             lambda.set(IdxBizFanWarningRecord::getStatus, "1");
@@ -85,13 +85,13 @@ public class WarningRecordStatusMessage2 extends EmqxListener {
             List<String> traceIds = (List<String>) analysisResult.get("traceIds");
             lambda.in(IdxBizFanWarningRecord::getSequenceNbr, traceIds);
             idxBizFanWarningRecordService.update(lambda);
-        } else if (ObjectUtils.isNotEmpty(analysisResult) && analysisResult.get("warningObjectType").toString().equals("fan")) {
+        } else if (ObjectUtils.isNotEmpty(analysisResult) && analysisResult.get("warningObjectType").toString().equals("pv")) {
             LambdaUpdateWrapper<IdxBizPvWarningRecord> lambda = new LambdaUpdateWrapper<>();
             lambda.set(IdxBizPvWarningRecord::getDisposotionState, "已处置");
             lambda.set(IdxBizPvWarningRecord::getStatus, "1");
             lambda.set(IdxBizPvWarningRecord::getDisposotionDate, new Date());
             List<String> traceIds = (List<String>) analysisResult.get("traceIds");
-            lambda.eq(IdxBizPvWarningRecord::getSequenceNbr, traceIds);
+            lambda.in(IdxBizPvWarningRecord::getSequenceNbr, traceIds);
             idxBizPvWarningRecordService.update(lambda);
         }
     }

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

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.Enum.WarningNameEnum;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.*;
 import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.*;
+import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -28,6 +29,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 @EnableScheduling
 @Service
+@Slf4j
 public class HealthStatusIndicatorServiceImpl {
 
    // @Value("${healthValue_Warn}")
@@ -893,6 +895,7 @@ public class HealthStatusIndicatorServiceImpl {
      */
     @Async
     public void fetchDataPv(List<IdxBizPvWarningRecord> idxBizPvWarningRecords) {
+        log.info("===开始触发风险预警模型===数量为：{}", idxBizPvWarningRecords.size());
         idxBizPvWarningRecords.stream().forEach(idxBizPvWarningRecord -> {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(INDEX_KEY_PV);
@@ -930,6 +933,7 @@ public class HealthStatusIndicatorServiceImpl {
      */
     @Async
     public void fetchDataFan(List<IdxBizFanWarningRecord> idxBizFanWarningRecords) {
+        log.info("===开始触发风险预警模型===数量为：{}", idxBizFanWarningRecords.size());
         idxBizFanWarningRecords.stream().forEach(idxBizFanWarningRecord -> {
             BizMessage bizMessage = new BizMessage();
             bizMessage.setIndexKey(String.format(INDEX_KEY_FAN, idxBizFanWarningRecord.getNumber()));

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

@@ -4,7 +4,7 @@
 
 <select id="getHealthScoreInfo" resultType="java.math.BigDecimal">
     SELECT
-    avg( a.avgHealthIndex ) AS healthIndex
+    round(avg( a.avgHealthIndex ), 2) AS healthIndex
     FROM
     (
     SELECT
@@ -57,7 +57,7 @@
 
     <select id="getHealthScoreInfoByStation" resultType="java.math.BigDecimal">
         SELECT
-        IFNULL( HEALTH_INDEX , 100 ) AS healthIndex
+        round(IFNULL( HEALTH_INDEX , 100 ), 2) AS healthIndex
         FROM
         ${tableName}
         <where>
@@ -211,7 +211,7 @@
                 WARNING_NAME
         ) a
     ORDER BY
-        a.allNum DESC
+        a.allNum desc
     </select>
 
 
@@ -307,7 +307,7 @@
              warningName
     having pointName IS NOT NULL
     AND pointName != ''
-    order by num desc
+    order by num asc
     </select>
 
 <select id="getAllEquipAlarmInfoAnalysisByArea" resultType="java.util.Map">
@@ -349,7 +349,7 @@
     WHERE
     a.pointName IS NOT NULL
     AND a.pointName != ''
-    order by a.num desc
+    order by a.num ASC
     </select>
 
 <select id="getSubSystemInfo" resultType="java.util.Map">