/*修改一些bug；mqtt broker信息读取改成配置文件方式*/

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;
       }
    }

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("异常");
                             }
                         }
                     }

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<ResultAnalysis> filterList = resultAnalysisService.selectResultAnalysisList(resultAnalysis);

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;

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;

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";