Merge branch 'server_five_dongxiaodong' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five

# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml

couplet-auth/src/main/resources/bootstrap.yml

@@ -17,11 +17,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-common/couplet-common-event/src/main/java/com/couplet/analyze/common/contents/AnalyzeEventContents.java

@@ -17,14 +17,14 @@ public interface AnalyzeEventContents {
     /**
      * 电子围栏
      */
-    static final String ELECTRONIC_FENCE = "electronic-fence";
+    static final String ELECTRONIC_FENCE = "electronic_fence";
     /**
      * 实时数据
      */
-    static final String REAL_TIME_DATA = "real-time-data";
+    static final String REAL_TIME_DATA = "real_time_data";
 
     /**
      * 存储
      */
-    static final String STORED_EVENT = "stored-event";
+    static final String STORED_EVENT = "stored_event";
 }

couplet-gateway/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java

@@ -1,7 +1,5 @@
 package com.couplet.analyze.msg.model;
 
-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;
@@ -11,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;
@@ -37,8 +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));
+    }
+
+
+
     /**
      * 消费者配置
      *
@@ -46,17 +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));
@@ -71,24 +100,17 @@ 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;
 //                        });
-
-                        try {
-                            sleep(100);
-                        } catch (Exception e) {
-                            throw new VehicleException("睡眠失败" + e);
-                        }
                     }
                 });
             }
         } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            consumer.close();
+            log.error(e.getMessage());
         }
     }
+
 }

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/BreakdownServiceImpl.java

@@ -1,6 +1,7 @@
 package com.couplet.analyze.msg.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.couplet.analyze.common.contents.AnalyzeEventContents;
 import com.couplet.analyze.msg.contents.StateConstant;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
@@ -26,7 +27,7 @@ import java.util.concurrent.TimeUnit;
  * @Date: 2024/4/2
  * @Description: 故障事件
  */
-@Service("breakdown")
+@Service(AnalyzeEventContents.BREAKDOWN)
 public class BreakdownServiceImpl extends KeyExpirationEventMessageListener implements IncidentService {
 
     /**
@@ -93,7 +94,7 @@ public class BreakdownServiceImpl extends KeyExpirationEventMessageListener impl
      */
     @Override
     public String getName() {
-        return "breakdown";
+        return AnalyzeEventContents.BREAKDOWN;
     }
 
     public void scheduledRedis() {

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/ElectronicFenceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.couplet.analyze.msg.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.couplet.analyze.common.contents.AnalyzeEventContents;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
 import com.couplet.common.core.text.Convert;
@@ -22,7 +23,7 @@ import java.util.Set;
  * @Date: 2024/4/2
  * @Description: 电子围栏事件服务实现类
  */
-@Service("electronic_fence")
+@Service(AnalyzeEventContents.ELECTRONIC_FENCE)
 @Log4j2
 public class ElectronicFenceServiceImpl implements IncidentService {
 
@@ -86,7 +87,7 @@ public class ElectronicFenceServiceImpl implements IncidentService {
      */
     @Override
     public String getName() {
-        return "electronic-fence";
+        return AnalyzeEventContents.ELECTRONIC_FENCE;
     }
 
 

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.couplet.analyze.msg.service.impl;
 
+import com.couplet.analyze.common.contents.AnalyzeEventContents;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.mapper.IncidentMapper;
 import com.couplet.analyze.msg.service.IncidentService;
@@ -18,7 +19,7 @@ import java.util.concurrent.TimeUnit;
  * @Date: 2024/4/2
  * @Description: 实时数据事件
  */
-@Service("real_time_data")
+@Service(AnalyzeEventContents.REAL_TIME_DATA)
 @Log4j2
 public class RealTimeDataServiceImpl implements IncidentService {
 
@@ -37,7 +38,8 @@ public class RealTimeDataServiceImpl implements IncidentService {
      * @param coupletMsgData
      */
     @Override
-    public void incident(CoupletMsgData coupletMsgData) {
+    public synchronized void incident(CoupletMsgData coupletMsgData) {
+
 
         log.info("实时数据事件开始.....");
 
@@ -69,6 +71,6 @@ public class RealTimeDataServiceImpl implements IncidentService {
      */
     @Override
     public String getName() {
-        return "real-time-data";
+        return AnalyzeEventContents.REAL_TIME_DATA;
     }
 }

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/StoredEventServiceImpl.java

@@ -1,5 +1,6 @@
 package com.couplet.analyze.msg.service.impl;
 
+import com.couplet.analyze.common.contents.AnalyzeEventContents;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.mapper.IncidentMapper;
 import com.couplet.analyze.msg.service.IncidentService;
@@ -12,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @Date: 2024/4/2
  * @Description: 事件存储服务
  */
-@Service("stored_event")
+@Service(AnalyzeEventContents.STORED_EVENT)
 @Log4j2
 public class StoredEventServiceImpl implements IncidentService {
     @Autowired
@@ -36,6 +37,6 @@ public class StoredEventServiceImpl implements IncidentService {
      */
     @Override
     public String getName() {
-        return "stored-event";
+        return AnalyzeEventContents.STORED_EVENT;
     }
 }

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

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

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

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

couplet-modules/couplet-business/src/main/resources/bootstrap.yml

@@ -16,11 +16,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

couplet-modules/couplet-file/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-gen/src/main/resources/bootstrap.yml

@@ -17,11 +17,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-job/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -38,7 +36,7 @@ mqtt:
     #    broker: mqtt://115.159.47.13:1883
     username:
     password:
-    clientId: liuyunhu
+    clientId: xiaoYao
     qos: 0
-    topic: liuyunhu
+    topic: xiaoYao
 

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
         # 共享配置

couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置