Merge remote-tracking branch 'origin/server_five' into server_five

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-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/ModelMessage.java

@@ -108,7 +108,7 @@ public class ModelMessage {
             });
             mqttClient.subscribe("test",0);
 
-            Thread.sleep(1000*60*10);
+            Thread.sleep(1000*6*10);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

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

@@ -1,38 +1,38 @@
-//package com.couplet.analyze.msg.service.impl;
+package com.couplet.analyze.msg.service.impl;
-//
+
-//import com.couplet.analyze.msg.domain.CoupletMsgData;
+import com.couplet.analyze.msg.domain.CoupletMsgData;
-//import com.couplet.analyze.msg.service.IncidentService;
+import com.couplet.analyze.msg.service.IncidentService;
-//import com.couplet.common.log.annotation.Log;
+import com.couplet.common.log.annotation.Log;
-//import lombok.extern.log4j.Log4j2;
+import lombok.extern.log4j.Log4j2;
-//import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Service;
-//
+
-///**
+/**
-// * @Author: LiJiaYao
+ * @Author: LiJiaYao
-// * @Date: 2024/4/2
+ * @Date: 2024/4/2
-// * @Description: 故障事件
+ * @Description: 故障事件
-// */
+ */
-//@Service("breakdown")
+@Service("breakdown")
-//@Log4j2
+@Log4j2
-//public class BreakdownServiceImpl implements IncidentService {
+public class BreakdownServiceImpl implements IncidentService {
-//    /**
+    /**
-//     * 故障事件
+     * 故障事件
-//     *
+     *
-//     * @param coupletMsgData
+     * @param coupletMsgData
-//     */
+     */
-//    @Override
+    @Override
-//    public void incident(CoupletMsgData coupletMsgData) {
+    public void incident(CoupletMsgData coupletMsgData) {
-//
+
-//        log.info("故障事件开始.....");
+        log.info("故障事件开始.....");
-//        log.info("故障事件结束.....");
+        log.info("故障事件结束.....");
-//
+
-//
+
-//    }
+    }
-//
+
-//    /**
+    /**
-//     * @return 获取事件名称
+     * @return 获取事件名称
-//     */
+     */
-//    @Override
+    @Override
-//    public String getName() {
+    public String getName() {
-//        return "breakdown";
+        return "breakdown";
-//    }
+    }
-//}
+}

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

@@ -1,33 +1,40 @@
-//package com.couplet.analyze.msg.service.impl;
+package com.couplet.analyze.msg.service.impl;
-//
+
-//import com.couplet.analyze.msg.domain.CoupletMsgData;
+import com.couplet.analyze.msg.domain.CoupletMsgData;
-//import com.couplet.analyze.msg.service.IncidentService;
+import com.couplet.analyze.msg.service.IncidentService;
-//import org.springframework.stereotype.Service;
+import lombok.extern.log4j.Log4j2;
-//
+import org.springframework.stereotype.Service;
-///**
+
-// * @Author: LiJiaYao
+/**
-// * @Date: 2024/4/2
+ * @Author: LiJiaYao
-// * @Description: 电子围栏事件服务实现类
+ * @Date: 2024/4/2
-// */
+ * @Description: 电子围栏事件服务实现类
-//@Service("electronic-fence")
+ */
-//public class ElectronicFenceServiceImpl implements IncidentService {
+@Service("electronic-fence")
-//
+@Log4j2
-//
+public class ElectronicFenceServiceImpl implements IncidentService {
-//    /**
+
-//     * 电子围栏事件
+
-//     *
+    /**
-//     * @param coupletMsgData
+     * 电子围栏事件
-//     */
+     *
-//    @Override
+     * @param coupletMsgData
-//    public void incident(CoupletMsgData coupletMsgData) {
+     */
-//
+    @Override
-//    }
+    public void incident(CoupletMsgData coupletMsgData) {
-//
+
-//    /**
+        log.info("电子围栏事件开始.......");
-//     * @return 电子围栏service 名称
+        log.info("电子围栏事件结束.......");
-//     */
+
-//    @Override
+
-//    public String getName() {
+
-//        return "electronic-fence";
+    }
-//    }
+
-//}
+    /**
+     * @return 电子围栏service 名称
+     */
+    @Override
+    public String getName() {
+        return "electronic-fence";
+    }
+}

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

@@ -1,33 +1,38 @@
-//package com.couplet.analyze.msg.service.impl;
+package com.couplet.analyze.msg.service.impl;
-//
+
-//import com.couplet.analyze.msg.domain.CoupletMsgData;
+import com.couplet.analyze.msg.domain.CoupletMsgData;
-//import com.couplet.analyze.msg.service.IncidentService;
+import com.couplet.analyze.msg.service.IncidentService;
-//import org.springframework.stereotype.Service;
+import lombok.extern.log4j.Log4j2;
-//
+import org.springframework.stereotype.Service;
-///**
+
-// * @Author: LiJiaYao
+/**
-// * @Date: 2024/4/2
+ * @Author: LiJiaYao
-// * @Description: 实时数据事件
+ * @Date: 2024/4/2
-// */
+ * @Description: 实时数据事件
-//@Service("real-time-data")
+ */
-//public class RealTimeDataServiceImpl implements IncidentService {
+@Service("real-time-data")
-//
+@Log4j2
-//    /**
+public class RealTimeDataServiceImpl implements IncidentService {
-//     * 实时数据事件
+
-//     *
+    /**
-//     * @param coupletMsgData
+     * 实时数据事件
-//     */
+     *
-//    @Override
+     * @param coupletMsgData
-//    public void incident(CoupletMsgData coupletMsgData) {
+     */
-//
+    @Override
-//    }
+    public void incident(CoupletMsgData coupletMsgData) {
-//
+
-//    /**
+        log.info("实时数据事件开始.....");
-//     * 实时数据事件
+        log.info("实时数据事件结束.....");
-//     * @return
+
-//     */
+    }
-//    @Override
+
-//    public String getName() {
+    /**
-//        return "real-time-data";
+     * 实时数据事件
-//    }
+     * @return
-//}
+     */
+    @Override
+    public String getName() {
+        return "real-time-data";
+    }
+}

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.couplet.analyze.msg.config.RabbitMQConfig

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/mapper/incident/SysIncidentMapper.xml

@@ -6,7 +6,7 @@
 
 
     <insert id="reportMapper">
-        INSERT INTO `vehicle-resolver`.`resolver_report_data`
+        INSERT INTO `couplet-cloud`.`couplet_msg_data`
         (`vin`, `create_time`, `longitude`, `latitude`,
          `speed`, `mileage`, `voltage`, `current`, `resistance`, `gear`,
          `acceleration_pedal`, `fuel_consumption_rate`,

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

@@ -16,11 +16,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
         # 共享配置