From 55da17e813ae087c9bd0008c5df5fe003d2ca11c Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Mon, 29 Sep 2025 09:08:34 +0800 Subject: [PATCH] =?UTF-8?q?/*=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9Bbug?= =?UTF-8?q?=EF=BC=9Bmqtt=20broker=E4=BF=A1=E6=81=AF=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=94=B9=E6=88=90=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=96=B9?= =?UTF-8?q?=E5=BC=8F*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/inspect/analysis/domain/AlgValue.java | 2 +- .../com/inspect/analysis/utils/ResultAnalysisUtils.java | 7 ++++--- .../taskstatus/controller/PatrolTaskStatusController.java | 3 +-- .../com/inspect/metadata/mqtt/HuaRuanMQTTServiceImpl.java | 5 +++++ .../src/main/java/com/inspect/metadata/mqtt/MQTTUtils.java | 5 +++++ .../java/com/inspect/metadata/mqtt/MqttProperties.java | 5 +++++ 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AlgValue.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AlgValue.java index 804fe67..a0023a0 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AlgValue.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AlgValue.java @@ -32,7 +32,7 @@ public class AlgValue { } return false; - } catch (NumberFormatException var4) { + } catch (NumberFormatException e) { return true; } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java index da37a85..8114fc5 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java @@ -155,10 +155,11 @@ public class ResultAnalysisUtils { } catch (Exception e) { log.info("PARSE_ALG_METER_ALARM_VALUE_SINGLE_NO_DIGIT value: {}", value); resultAnalysis.setResStatus("0"); - resultAnalysis.setPointStatus("1"); + //resultAnalysis.setPointStatus("1"); + resultAnalysis.setPointStatus("0"); // resultAnalysis.setResultType("0"); - resultAnalysis.setResultType("1"); - defaultDesc = messageUtils.get("正常"); + resultAnalysis.setResultType("0"); + defaultDesc = messageUtils.get("异常"); } } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java index 035353e..6d991ca 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java @@ -182,8 +182,7 @@ public class PatrolTaskStatusController extends BaseController { item.setAiQxNum(analysisRes == null ? 0 : analysisRes.getAiQxNum()); item.setCsYcNum(analysisRes == null ? 0 : analysisRes.getCsYcNum()); item.setAiYcNum(analysisRes == null ? 0 : analysisRes.getAiYcNum()); - log.info("PATROL_TASK_STATUS LIST analysisRes.getLineId: {}", - analysisRes == null ? -1 : analysisRes.getLineId()); + log.info("PATROL_TASK_STATUS LIST analysisRes: {}", analysisRes == null ? -1 : analysisRes); resultAnalysis.setResultType("0"); resultAnalysis.setTaskPatrolId(item.getTaskPatrolledId()); List filterList = resultAnalysisService.selectResultAnalysisList(resultAnalysis); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/HuaRuanMQTTServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/HuaRuanMQTTServiceImpl.java index 234bde7..142048c 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/HuaRuanMQTTServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/HuaRuanMQTTServiceImpl.java @@ -5,10 +5,15 @@ import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; import org.eclipse.paho.client.mqttv3.MqttCallback; import org.eclipse.paho.client.mqttv3.MqttMessage; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; @Slf4j @Service +@ConditionalOnProperty( + name = {"hua-ruan.mqtt.enable"}, + havingValue = "true" +) public class HuaRuanMQTTServiceImpl { private final MQTTUtils mqttUtils; diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/MQTTUtils.java b/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/MQTTUtils.java index 1de7537..b036253 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/MQTTUtils.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/MQTTUtils.java @@ -3,6 +3,7 @@ package com.inspect.metadata.mqtt; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @@ -10,6 +11,10 @@ import javax.annotation.PreDestroy; @Slf4j @Service +@ConditionalOnProperty( + name = {"hua-ruan.mqtt.enable"}, + havingValue = "true" +) public class MQTTUtils { private final MqttProperties properties; diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/MqttProperties.java b/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/MqttProperties.java index 3a094ec..cba6fef 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/MqttProperties.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/mqtt/MqttProperties.java @@ -1,12 +1,17 @@ package com.inspect.metadata.mqtt; import lombok.Data; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @Data @Component @ConfigurationProperties(prefix = "hua-ruan.mqtt") +@ConditionalOnProperty( + name = {"hua-ruan.mqtt.enable"}, + havingValue = "true" +) public class MqttProperties { /** MQTT Broker IP */ private String ip = "localhost";