From c4f1beed8bf8e6bef820a8bbc5993f69095895cd Mon Sep 17 00:00:00 2001
From: dongxiaodong <13970843+dxdwork@user.noreply.gitee.com>
Date: Mon, 8 Apr 2024 20:07:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../couplet/analyze/msg/model/ModelsKafkaMessage.java  |  1 +
 .../src/main/resources/bootstrap.yml                   |  2 ++
 .../server/controller/SysTroubleController.java        |  9 +++++++++
 .../business/server/mapper/SysTroubleMapper.java       |  2 ++
 .../business/server/service/SysTroubleService.java     |  2 ++
 .../server/service/impl/SysTroubleServiceImpl.java     | 10 ++++++++++
 .../resources/mapper/business/SysTroubleMapper.xml     |  3 +++
 .../couplet-file/src/main/resources/bootstrap.yml      |  2 ++
 .../couplet-gen/src/main/resources/bootstrap.yml       |  2 ++
 .../couplet-job/src/main/resources/bootstrap.yml       |  2 ++
 .../src/main/resources/bootstrap.yml                   |  2 ++
 .../src/main/resources/bootstrap.yml                   |  4 ++--
 .../couplet-system/src/main/resources/bootstrap.yml    |  2 ++
 .../couplet-monitor/src/main/resources/bootstrap.yml   |  2 ++
 14 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
index 1c2c085..79d7dc1 100644
--- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
+++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
@@ -1,5 +1,6 @@
 package com.couplet.analyze.msg.model;
 
+import com.couplet.analyze.common.event.AnalyzeEventCache;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
 import com.couplet.common.core.exception.vehicle.VehicleException;
diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
index bed4d26..1c4ab93 100644
--- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java
index b9f733b..8f79174 100644
--- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java
+++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java
@@ -93,4 +93,13 @@ public class SysTroubleController extends BaseController {
         troubleService.newFaultData(code);
         return success();
     }
+
+    /**
+     * 查询故障的状态并处理
+     */
+    @PostMapping("/getUpdState")
+    public Result<?> getUpdState(@RequestBody CoupletTroubleCode code) {
+        int updateState = troubleService.updateState(code);
+        return Result.success(updateState);
+    }
 }
diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java
index bf95533..760a95a 100644
--- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java
+++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java
@@ -29,4 +29,6 @@ public interface SysTroubleMapper extends BaseMapper<CoupletTroubleCode> {
     void newFaultData(CoupletTroubleCode code);
 
     void cleanTroubleCode();
+
+    int updateState(CoupletTroubleCode code);
 }
diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java
index cb9b551..ca8ba18 100644
--- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java
+++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java
@@ -26,4 +26,6 @@ public interface SysTroubleService extends IService<CoupletTroubleCode> {
     void newFaultData(CoupletTroubleCode code);
 
     void cleanTroubleCode();
+
+    int updateState(CoupletTroubleCode code);
 }
diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/SysTroubleServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/SysTroubleServiceImpl.java
index 56797cc..511ff60 100644
--- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/SysTroubleServiceImpl.java
+++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/SysTroubleServiceImpl.java
@@ -58,4 +58,14 @@ public class SysTroubleServiceImpl extends ServiceImpl<SysTroubleMapper, Couplet
         sysTroubleMapper.cleanTroubleCode();
     }
 
+    /**
+     * 获取故障状态
+     * @param code
+     * @return
+     */
+    @Override
+    public int updateState(CoupletTroubleCode code) {
+        return 0;
+    }
+
 }
diff --git a/couplet-modules/couplet-business/src/main/resources/mapper/business/SysTroubleMapper.xml b/couplet-modules/couplet-business/src/main/resources/mapper/business/SysTroubleMapper.xml
index 9f9f3e5..9f55f12 100644
--- a/couplet-modules/couplet-business/src/main/resources/mapper/business/SysTroubleMapper.xml
+++ b/couplet-modules/couplet-business/src/main/resources/mapper/business/SysTroubleMapper.xml
@@ -26,6 +26,9 @@
     <update id="cleanTroubleCode">
         truncate table couplet_trouble_code
     </update>
+    <update id="updateState">
+        update couplet_trouble_code set processing_state = 1 where thourble_id = #{troubleId}
+    </update>
 
     <select id="selectTroubleList" parameterType="com.couplet.business.server.mapper.SysTroubleMapper" resultMap="SysTroubleResult">
         <include refid="selectTroubleVo"/>
diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml
index fa968e9..be8cc08 100644
--- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
index e3d77cd..aa5cec6 100644
--- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
@@ -17,9 +17,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml
index bb1f871..2bfb6f5 100644
--- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
index 00ac887..2643e99 100644
--- a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
index 16394e6..47d8323 100644
--- a/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
@@ -38,7 +38,7 @@ mqtt:
 #    broker: mqtt://115.159.47.13:1883
     username:
     password:
-    clientId: fluxMq
+    clientId: mq
     qos: 0
-    topic: test
+    topic: dxd
 
diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
index d9315bd..c3d342c 100644
--- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
index d1064dc..9d73f5a 100644
--- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
+++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

From 9f175785643f9ea50d0a1e05c763d67031e84b28 Mon Sep 17 00:00:00 2001
From: dongxiaodong <13970843+dxdwork@user.noreply.gitee.com>
Date: Mon, 8 Apr 2024 20:37:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analyze/msg/model/ModelsKafkaMessage.java | 60 +++++++++++++------
 .../src/main/resources/bootstrap.yml          |  2 +
 .../src/main/resources/bootstrap.yml          |  2 +
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
index e607466..934e710 100644
--- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
+++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
@@ -1,8 +1,5 @@
 package com.couplet.analyze.msg.model;
 
-import com.couplet.analyze.common.event.AnalyzeEventCache;
-import com.couplet.analyze.common.contents.AnalyzeEventContents;
-import com.couplet.analyze.common.event.AnalyzeEventCache;
 import com.couplet.analyze.common.event.AnalyzeEventCache;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
@@ -12,14 +9,18 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import java.time.Duration;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import static com.couplet.analyze.msg.utils.MsgUtils.hexToString;
 import static com.couplet.analyze.msg.utils.MsgUtils.sendMsg;
@@ -38,9 +39,38 @@ public class ModelsKafkaMessage {
     private static final String TOPIC_NAME = "online";
     private static final String BOOTSTRAP_SERVERS = "39.103.133.136:9092";
 
+
+    //线程池，用于异步处理消息到来时的业务逻辑
+    private ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+    //kafka消费者实例化为类成员变量
+    KafkaConsumer<String, String> consumer;
+
     @Autowired
     private AnalyzeEventCache analyzeEventCache;
 
+
+
+
+
+    //kafka消费者初始化
+    @PostConstruct
+    public void initKafkaConsumer() {
+        Properties props = new Properties();
+        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, BOOTSTRAP_SERVERS);
+//        props.put(ConsumerConfig.GROUP_ID_CONFIG, "my-consumer-group");
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, "ddd");
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+
+        //消费者
+        consumer = new KafkaConsumer<>(props);
+        //订阅主题
+        consumer.subscribe(Collections.singletonList(TOPIC_NAME));
+    }
+
+
+
     /**
      * 消费者配置
      *
@@ -48,19 +78,14 @@ public class ModelsKafkaMessage {
      */
     @Scheduled(fixedDelay = 50)
     public void consumerMessages() {
-        Properties props = new Properties();
-        props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, BOOTSTRAP_SERVERS);
-        props.put(ConsumerConfig.GROUP_ID_CONFIG, "my-consumer-group");
-        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
-        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
+        executorService.execute(this::consumer);
 
-        //创建消费者
-        KafkaConsumer<String, String> consumer = new KafkaConsumer<>(props);
 
+    }
+
+    public void consumer() {
         try {
 
-            //订阅主题
-            consumer.subscribe(Collections.singletonList(TOPIC_NAME));
             //持续消费消息
             while (true) {
                 ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
@@ -75,7 +100,7 @@ public class ModelsKafkaMessage {
                             IncidentService incidentService = SpringUtils.getBean(string);
                             incidentService.incident(msgData);
                         }
-                      //  发送消息
+                        //  发送消息
 //                        rabbitTemplate.convertAndSend("couplet-code-queue",msgData,message -> {
 //                            message.getMessageProperties().setMessageId(UUID.randomUUID().toString());
 //                            return message;
@@ -90,9 +115,8 @@ public class ModelsKafkaMessage {
                 });
             }
         } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            consumer.close();
+            log.error(e.getMessage());
         }
     }
+
 }
diff --git a/couplet-modules/couplet-business/src/main/resources/bootstrap.yml b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml
index d900876..6c75304 100644
--- a/couplet-modules/couplet-business/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml
@@ -16,9 +16,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
index 554d9a8..150ec78 100644
--- a/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
+++ b/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml
@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置