1111

# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/BreakdownServiceImpl.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java

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

@@ -17,11 +17,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleCode.java

@@ -3,12 +3,15 @@ package com.couplet.common.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.couplet.common.core.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotEmpty;
+import java.util.Date;
 
 /**
  * @author DongXiaoDong
@@ -38,34 +41,28 @@ public class CoupletTroubleCode {
     private String troubleCode;
 
     /**
-     * 故障位
+     * vin
      */
-    @Excel(name = "故障位")
+    @Excel(name = "vin")
-    private String troublePosition;
+    private String troubleVin;
-
-    /**
-     * 故障值
-     */
-    @Excel(name = "故障值")
-    private String troubleValue;
 
     /**
      * 故障标签
      */
     @Excel(name = "故障标签")
-    private String troubleTag;
+    private Integer troubleTag;
 
     /**
-     * 故障类型Id
+     * 故障开始时间
      */
-    @Excel(name = "故障类型Id")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotEmpty(message = "故障类型Id不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Integer typeId;
+    private Date troubleStartTime;
 
     /**
-     * 故障等级Id
+     * 故障结束时间
      */
-    @Excel(name = "故障等级Id")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotEmpty(message = "故障等级Id不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Integer gradeId;
+    private Date troubleEndTime;
 }

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleFault.java

@@ -19,34 +19,34 @@ import java.util.Date;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class CoupletTroubleLog {
+public class CoupletTroubleFault {
     /**
      * 故障记录Id
      */
-    private Integer troubleLogId;
+    private Integer troubleFaultId;
 
     /**
      * 故障码
      */
-    private String troubleLogCode;
+    private String troubleFaultCode;
 
     /**
-     * 故障码VIN
+     * 故障码类型
      */
-    private String troubleLogVin;
+    private String troubleFaultType;
 
     /**
-     * 开始预警时间
+     * 故障标签
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String troubleFaultTag;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date troubleLogStartTime;
 
     /**
-     * 结束预警时间
+     * 故障位
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String troubleFaultPosition;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date troubleLogEndTime;
 
+    /**
+     * 故障值
+     */
+    private String troubleFaultValue;
 }

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleType.java

@@ -1,15 +0,0 @@
-package com.couplet.common.domain;
-
-import lombok.Data;
-
-/**
- * @author DongXiaoDong
- * @version 1.0
- * @date 2024/3/26 21:50
- * @description
- */
-@Data
-public class CoupletTroubleType {
-    private Integer typeId;
-    private String typeName;
-}

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Fence.java

@@ -84,10 +84,11 @@ public class Fence extends BaseEntity{
 
     private Integer alarmStatus;
 
-    @TableField(exist = false)
+
     /**
      * 标识
      */
+    @TableField(exist = false)
     private Integer logoId;
     @TableField(exist = false)
     private String logoName;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Vehicle.java

@@ -29,6 +29,7 @@ public class Vehicle {
      * @description 中间表id
      * @date
      */
+    @TableField(exist = false)
     private Long middleId;
     /*
      *车辆id

couplet-common/couplet-common-business/src/main/java/com/couplet/log/annotation/Record.java

@@ -1,10 +0,0 @@
-package com.couplet.log.annotation;
-
-/**
- * @author DongXiaoDong
- * @version 1.0
- * @date 2024/3/28 15:39
- * @description
- */
-public @interface Record {
-}

couplet-common/couplet-common-business/src/main/java/com/couplet/log/aop/AopRecord.java

@@ -1,10 +0,0 @@
-package com.couplet.log.aop;
-
-/**
- * @author DongXiaoDong
- * @version 1.0
- * @date 2024/3/28 23:12
- * @description
- */
-public class AopRecord {
-}

couplet-common/couplet-common-business/src/main/java/com/couplet/remote/RemoteTroubleService.java

@@ -0,0 +1,25 @@
+package com.couplet.remote;
+
+import com.couplet.common.core.constant.ServiceNameConstants;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.domain.CoupletTroubleCode;
+import com.couplet.remote.factory.RemoteTroubleFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(contextId = "remoteTroubleService" ,
+        value = ServiceNameConstants.BUSINESS_SERVICE,
+        fallbackFactory = RemoteTroubleFallbackFactory.class
+)
+public interface RemoteTroubleService {
+
+    /**
+     * 新增故障码
+     * @param code
+     * @return
+     */
+    @PostMapping("/trouble/newFaultData")
+    public Result<?> newFaultData(@RequestBody CoupletTroubleCode code);
+
+}

couplet-common/couplet-common-business/src/main/java/com/couplet/remote/RemoteVehicleService.java

@@ -51,4 +51,7 @@ public interface RemoteVehicleService {
     @GetMapping("/findByVIN/{vin}")
     public Result<List<Vehicle>> findByVIN(@PathVariable("vin") String vin);
 
+    @GetMapping("onOrOutLineByVIN")
+    public Integer onOrOutLineByVIN(@RequestParam("params") String params);
+
 }

couplet-common/couplet-common-business/src/main/java/com/couplet/remote/factory/RemoteTroubleFallbackFactory.java

@@ -0,0 +1,34 @@
+package com.couplet.remote.factory;
+
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.domain.CoupletTroubleCode;
+import com.couplet.remote.RemoteTroubleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author fufanrui
+ * @version 1.0
+ * @description: TODO
+ * @date 2024/4/2 14:46
+ */
+@Component
+public class RemoteTroubleFallbackFactory implements FallbackFactory<RemoteTroubleService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteTroubleFallbackFactory.class);
+
+
+    @Override
+    public RemoteTroubleService create(Throwable cause) {
+        return new RemoteTroubleService() {
+
+
+            @Override
+            public Result<?> newFaultData(CoupletTroubleCode code) {
+                return Result.error("调用失败...."+cause.getMessage());
+            }
+
+        };
+    }
+}

couplet-common/couplet-common-business/src/main/java/com/couplet/remote/factory/RemoteVehicleFallbackFactory.java

@@ -50,6 +50,12 @@ public class RemoteVehicleFallbackFactory implements FallbackFactory<RemoteVehic
             public Result<List<Vehicle>> findByVIN(String vin) {
                 return Result.error("车辆服务调用失败:" + cause.getMessage());
             }
+
+            @Override
+            public Integer onOrOutLineByVIN(String params) {
+                log.error("车辆服务调用失败:" + cause.getMessage());
+                return null;
+            }
         };
     }
 }

couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java

@@ -26,9 +26,10 @@ public class ServiceNameConstants {
      * @param null:
       * @return null
      * @author 付凡芮
-     * @description  couplet-business
+     * @description 车辆管理模块
      * @date
      */
+    public static final String VEHICLE_SERVICE = "couplet-vehicle";
+
     public static final String BUSINESS_SERVICE = "couplet-business";
-    public static final String VEHICLE_SERVICE = "vehicle-service";
 }

couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/configure/RedisListenerConfig.java

@@ -0,0 +1,33 @@
+package com.couplet.common.redis.configure;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/4
+ * @Description: redis监听配置
+ */
+@Configuration
+public class RedisListenerConfig {
+
+    @Bean
+    RedisMessageListenerContainer listenerContainer(RedisConnectionFactory redisConnectionFactory) {
+
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(redisConnectionFactory);
+        return container;
+    }
+
+    @Bean
+    KeyExpirationEventMessageListener   redisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
+        return new KeyExpirationEventMessageListener(listenerContainer);
+    }
+
+
+
+
+}

couplet-common/couplet-common-system/pom.xml

@@ -23,5 +23,10 @@
             <groupId>com.couplet</groupId>
             <artifactId>couplet-common-core</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-business</artifactId>
+        </dependency>
     </dependencies>
 </project>

couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/RemoteCodeService.java

@@ -0,0 +1,22 @@
+package com.couplet.common.system.remote;
+
+import com.couplet.common.core.constant.ServiceNameConstants;
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.domain.CoupletTroubleCode;
+import com.couplet.common.system.remote.factory.RemoteCodeFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author DongXiaoDong
+ * @version 1.0
+ * @date 2024/4/4 16:00
+ * @description
+ */
+@FeignClient(contextId = "remoteCodeService",value = ServiceNameConstants.BUSINESS_SERVICE, fallbackFactory = RemoteCodeFallbackFactory.class)
+public interface RemoteCodeService {
+
+    @PostMapping("trouble/insertCode")
+    public Result<Integer> insertCode(@RequestBody CoupletTroubleCode coupletTroubleCode);
+}

couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/remote/factory/RemoteCodeFallbackFactory.java

@@ -0,0 +1,30 @@
+package com.couplet.common.system.remote.factory;
+
+import com.couplet.common.core.domain.Result;
+import com.couplet.common.domain.CoupletTroubleCode;
+import com.couplet.common.system.remote.RemoteCodeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author DongXiaoDong
+ * @version 1.0
+ * @date 2024/4/4 16:03
+ * @description
+ */
+@Slf4j
+@Component
+public class RemoteCodeFallbackFactory implements FallbackFactory<RemoteCodeService> {
+    @Override
+    public RemoteCodeService create(Throwable cause) {
+        log.error("调用日志服务异常：{}", cause.getMessage());
+        return new RemoteCodeService()
+        {
+            @Override
+            public Result<Integer> insertCode(CoupletTroubleCode coupletTroubleCode) {
+                return null;
+            }
+        };
+    }
+}

couplet-common/couplet-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -3,3 +3,4 @@ com.couplet.common.system.remote.factory.RemoteLogFallbackFactory
 com.couplet.common.system.remote.factory.RemoteFileFallbackFactory
 com.couplet.common.system.remote.factory.RemoteDeptFallbackFactory
 com.couplet.common.system.remote.factory.RemoteEmployeeFallbackFactory
+com.couplet.common.system.remote.factory.RemoteCodeFallbackFactory

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

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml

@@ -86,6 +86,15 @@
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
             <version>1.2.5</version>
         </dependency>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-modules-mq</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-common-business</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/CoupletMsgApplication.java

@@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @date 2024/4/2 8:39
  * @description
  */
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "com.couplet")
 @EnableScheduling
 @EnableFeignClients(basePackages = "com.couplet.**")
 public class CoupletMsgApplication {

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/consumer/FenceConsumer.java

@@ -0,0 +1,76 @@
+package com.couplet.analyze.msg.consumer;
+
+
+import com.alibaba.fastjson.JSON;
+import com.couplet.common.domain.request.FenceUpdateRequest;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/4
+ * @Description:
+ */
+@Log4j2
+@Component
+@RabbitListener(queues = "fenceQueue")
+public class FenceConsumer {
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    @RabbitHandler
+    public void fenceConsumer(FenceUpdateRequest fenceUpdateRequest, Channel channel, Message message) throws IOException {
+
+        log.info("消息进入队列，传入的数据是:[{}]", fenceUpdateRequest);
+
+        String messageId = message.getMessageProperties().getMessageId();
+        long deliveryTag = message.getMessageProperties().getDeliveryTag();
+        if (!redisTemplate.hasKey("消息不丢失:" + messageId)) {
+            redisTemplate.opsForValue().set("消息不丢失:" + messageId, "" + deliveryTag, 1, TimeUnit.MINUTES);
+        }
+
+        Long add = redisTemplate.opsForSet().add("消息不重复:" + messageId, messageId);
+        redisTemplate.expire("消息不重复:" + messageId, 5, TimeUnit.MINUTES);
+        try {
+            if (0 < add) {
+
+                HashMap<String, Object> hashMap = new HashMap<>();
+                HashSet<FenceUpdateRequest> hashSet = new HashSet<>();
+                hashSet.add(fenceUpdateRequest);
+                hashMap.put(fenceUpdateRequest.getFenceId()+"",fenceUpdateRequest);
+                redisTemplate.opsForValue().set("fence", JSON.toJSONString(hashMap),10,TimeUnit.MINUTES);
+                //判断车辆是否有实时数据,如果没有则删除数据
+                channel.basicAck(deliveryTag, false);
+            } else {
+                log.error("消息不能重复消费:[{}]", fenceUpdateRequest);
+                channel.basicReject(deliveryTag, false);
+            }
+        } catch (IOException e) {
+            log.error("消息未进入队列,传入的信息是:【{}】", fenceUpdateRequest);
+            String s = redisTemplate.opsForValue().get("消息不丢失:" + messageId);
+
+            Long o = Long.valueOf(s);
+            if (deliveryTag == o + 2) {
+                log.error("消息已丢失,无法传入的信息是:【{}】", fenceUpdateRequest);
+                channel.basicNack(deliveryTag, false, false);
+            } else {
+                log.error("消息已丢失,已再次传入的信息是:【{}】", fenceUpdateRequest);
+                channel.basicNack(deliveryTag, true, false);
+            }
+        }
+
+
+    }
+
+}

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/consumer/MsgConsumer.java

@@ -0,0 +1,92 @@
+package com.couplet.analyze.msg.consumer;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.couplet.analyze.msg.domain.CoupletMsgData;
+import com.couplet.analyze.msg.mapper.IncidentMapper;
+import com.couplet.analyze.msg.service.impl.realTimeData.RealTimeJudge;
+import com.couplet.common.domain.request.RealTimeDataRequest;
+import com.rabbitmq.client.Channel;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/4
+ * @Description:
+ */
+@Log4j2
+@Component
+@RabbitListener(queues = "finByVinQueueName")
+public class MsgConsumer {
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+    @Autowired
+    private IncidentMapper incidentMapper;
+
+    @RabbitHandler
+    public void realTimeDataConsumer(RealTimeDataRequest realTimeDataRequest, Channel channel, Message message) throws IOException {
+
+        log.info("消息进入队列，传入的数据是:[{}]", realTimeDataRequest);
+
+        String messageId = message.getMessageProperties().getMessageId();
+        long deliveryTag = message.getMessageProperties().getDeliveryTag();
+        if (!redisTemplate.hasKey("消息不丢失:" + messageId)) {
+            redisTemplate.opsForValue().set("消息不丢失:" + messageId, "" + deliveryTag, 1, TimeUnit.MINUTES);
+        }
+
+        Long add = redisTemplate.opsForSet().add("消息不重复:" + messageId, messageId);
+        redisTemplate.expire("消息不重复:" + messageId, 5, TimeUnit.MINUTES);
+        try {
+            if (0 < add) {
+
+                JSONObject jsonObject = JSONObject.parseObject(String.valueOf(realTimeDataRequest));
+                String vin = jsonObject.getString("vin");
+                Long userId = jsonObject.getLong("userId");
+                RealTimeDataRequest request = new RealTimeDataRequest();
+                request.setVin(vin);
+                request.setUserId(userId);
+                RealTimeJudge.addRealTime(request);
+                //判断车辆是否有实时数据,如果没有则删除数据
+                if (RealTimeJudge.isJudge(realTimeDataRequest.getVin())){
+                    log.info("开始实时数据传输:[{}]",realTimeDataRequest.getVin());
+                }
+                CoupletMsgData incident = incidentMapper.queryByIncident(realTimeDataRequest.getVin());
+                if (incident == null){
+                    log.error("没有数据......");
+                }
+                redisTemplate.opsForList().rightPush("coupletMsgData", JSON.toJSONString(incident));
+
+                channel.basicAck(deliveryTag, false);
+            } else {
+                log.error("消息不能重复消费:[{}]", realTimeDataRequest);
+                channel.basicReject(deliveryTag, false);
+            }
+        } catch (IOException e) {
+
+            log.error("消息未进入队列,传入的信息是:【{}】", realTimeDataRequest);
+            String s = redisTemplate.opsForValue().get("消息不丢失:" + messageId);
+
+            Long o = Long.valueOf(s);
+            if (deliveryTag == o + 2) {
+                log.error("消息已丢失,无法传入的信息是:【{}】", realTimeDataRequest);
+                channel.basicNack(deliveryTag, false, false);
+            } else {
+                log.error("消息已丢失,已再次传入的信息是:【{}】", realTimeDataRequest);
+                channel.basicNack(deliveryTag, true, false);
+            }
+
+        }
+
+
+    }
+
+}

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/contents/StateConstant.java

@@ -0,0 +1,89 @@
+package com.couplet.analyze.msg.contents;
+
+import io.swagger.models.auth.In;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/4
+ * @Description:
+ */
+@Component
+public class StateConstant {
+
+    /**
+     * 车辆状态
+     */
+    public static  final Integer VEHICLE_STATUS = 1;
+
+    /**
+     * 充电状态
+     */
+    public static final Integer CHARGING_STATUS = 1;
+
+    /**
+     * 运行状态
+     */
+    public static final Integer OPERATING_STATUS = 1;
+
+    /**
+     *  soc状态
+     */
+    public static final Integer SOC_STATUS = 1;
+
+    /**
+     * 可充电储能装置工作状态
+     */
+    public static final Integer CHARGING_ENERGY_STORAGE_STATUS = 1;
+
+    /**
+     * 驱动电机状态
+     */
+    public static final  Integer DRIVE_MOTOR_STATUS = 1;
+
+    /**
+     * 定位是否有效
+     */
+     public static final Integer POSITION_STATUS = 1;
+
+    /**
+     * EAS(汽车防盗系统)状态
+     */
+    public static final Integer EAS_STATUS = 1;
+
+    /**
+     * PTC(电动加热器)状态
+     */
+    public static final Integer PTC_STATUS = 1;
+
+    /**
+     *  ABS(防抱死)状态
+     */
+    public static final Integer ABS_STATUS = 1;
+
+    /**
+     * MCU(电机/逆变器)状态
+     */
+    public static final Integer MCU_STATUS = 1;
+    /**
+     * 动力电池加热状态
+     */
+    public static final Integer HEATING_STATUS = 1;
+    /**
+     *  动力电池当前状态
+     */
+    public static final Integer BATTERY_STATUS = 1;
+    /**
+     * 动力电池保温状态
+     */
+    public static final Integer BATTERY_INSULATION_STATUS = 1;
+    /**
+     * DCDC(电力交换系统) 状态
+     */
+    public static final Integer DCDC_STATUS = 1;
+    /**
+     * CHG(充电机)状态
+     */
+    public static final Integer CHG_STATUS = 1;
+
+}

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/mapper/IncidentMapper.java

@@ -15,4 +15,11 @@ public interface IncidentMapper {
      * @param coupletMsgData
      */
     public void reportMapper(CoupletMsgData coupletMsgData);
+
+    /**
+     * 查询是否存在该vin
+     */
+//    CoupletMsgData queryByIncident(RealTimeDataRequest realTimeDataRequest);
+    CoupletMsgData queryByIncident(String vin);
+
 }

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

@@ -3,26 +3,20 @@ package com.couplet.analyze.msg.model;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
 import com.couplet.common.core.utils.SpringUtils;
-import com.couplet.common.core.utils.uuid.IdUtils;
+import com.couplet.common.system.remote.RemoteCodeService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import static com.couplet.analyze.msg.contents.MsgContent.BROKER_URL;
 import static com.couplet.analyze.msg.contents.MsgContent.CLIENT_ID;
-import static io.lettuce.core.pubsub.PubSubOutput.Type.message;
 
 
 /**
@@ -35,13 +29,8 @@ import static io.lettuce.core.pubsub.PubSubOutput.Type.message;
 @Component
 public class ModelMessage {
 
-//    @Autowired
+    @Autowired
-//    private CoupletMsgService coupletMsgService;
+    private RabbitTemplate rabbitTemplate;
-
-//    @Autowired
-//    public ModelMessage(CoupletMsgService coupletMsgService){
-//        this.coupletMsgService = coupletMsgService;
-//    }
     static ArrayList<String> strings = new ArrayList<>() {
         {
             add("breakdown");
@@ -51,16 +40,19 @@ public class ModelMessage {
         }
     };
 
-    @Value("${mq.queueName}")
+    @Autowired
-    public String queueName;
+    private RemoteCodeService remoteCodeService;
 
-    //交换机
+//    @Value("${mq.queueName}")
-    @Value("${mq.exchangeName}")
+//    public String queueName;
-    public String exchangeName;
+//
-
+//    //交换机
-    //路由键
+//    @Value("${mq.exchangeName}")
-    @Value("${mq.routingKey}")
+//    public String exchangeName;
-    public String routingKey;
+//
+//    //路由键
+//    @Value("${mq.routingKey}")
+//    public String routingKey;
 
     @Scheduled(cron = "0/5 * * * * ?")
     public void startMsg() {
@@ -87,16 +79,43 @@ public class ModelMessage {
 
                     for (CoupletMsgData msgData : coupletMsgDataList) {
                         log.info("解析到车辆数据：{}", msgData);
-                        //发送日志到MQ
+//                        // 使用CompletableFuture.runAsync()方法创建一个异步任务，该任务会在一个新的线程中执行
+//                        CompletableFuture.runAsync(() ->{
+//                            // 创建一个CoupletTroubleLog对象用于记录故障日志
+//                            CoupletTroubleCode troubleCode = new CoupletTroubleCode();
+//                            //判断状态是否为异常
+//                            if (msgData.getVehicleStatus() !=1 || msgData.getEasStatus() !=1 || msgData.getHeatingStatus() !=1){
+//                                String code = generateGTA();
+//                                troubleCode.setTroubleCode(code);
+//                                String vin = msgData.getVin();
+//                                troubleCode.setTroubleVin(vin);
+//                                String position = getPosition();
+//                                troubleCode.setTroublePosition(position);
+//                                troubleCode.setTroubleValue("00");
+//                                String tag = getTag();
+//                                troubleCode.setTroubleTag(tag);
+//                                String type = getType();
+//                                troubleCode.setTroubleType(type);
+//                                troubleCode.setTroubleStartTime(new Date());
+//                                // 如果车辆状态为正常（状态为1），则添加结束时间为当前时间
+//                                if (msgData.getVehicleStatus() == 1){
+//                                    troubleCode.setTroubleEndTime(new Date());
+//                                }
+//                            }
+//                            // 调用远程服务插入故障日志信息
+//                            remoteCodeService.insertCode(troubleCode);
+//                        });
+//                        log.info("记录异常成功");
                         for (String string : strings) {
                             IncidentService incidentService = SpringUtils.getBean(string);
                             incidentService.incident(msgData);
                         }
-                        try {
+//                        不睡眠，他们也会主动拉取数据，不会影响其他服务
-                            Thread.sleep(1000);
+//                        try {
-                        } catch (InterruptedException e) {
+//                            Thread.sleep(1000);
-                            throw new RuntimeException(e);
+//                        } catch (InterruptedException e) {
-                        }
+//                            throw new RuntimeException(e);
+//                        }
                     }
 
                 }
@@ -108,12 +127,84 @@ public class ModelMessage {
             });
             mqttClient.subscribe("test",0);
 
-            Thread.sleep(1000*6*10);
+            Thread.sleep(1000*60*10);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
 
+//    /**
+//     *
+//     * 拼接GTA字符串
+//     * @return
+//     */
+//    public static String generateGTA() {
+//        // 生成以GTA开头的字符串
+//        String codefix = "GTA";
+//        // 删除4位数随机数字
+//        String s = generateRandomNumber(4);
+//        //拼接
+//        return codefix + s;
+//    }
+//
+//    /**
+//     * 随机生成1到10位的数字
+//     * @param length
+//     * @return
+//     */
+//    public static String generateRandomNumber(int length) {
+//        Random random = new Random();
+//        StringBuilder builder = new StringBuilder();
+//        for (int i = 0; i < length; i++) {
+//            builder.append(random.nextInt(10));
+//        }
+//        return builder.toString();
+//    }
+//
+//    /**
+//     * 生成 190 到 209 之间的随机数
+//     * @param
+//     * @return
+//     */
+//    public static String getPosition() {
+//        // 生成随机数对象
+//        Random rand = new Random();
+//
+//        // 生成 190 到 209 之间的随机数
+//        int randomNumber = rand.nextInt(20) + 190;
+//
+//        // 将随机数转换为字符串形式
+//        return String.valueOf(randomNumber);
+//    }
+//
+//    public static String getTag() {
+//        // 创建一个字符串数组存储三个状态
+//        String[] statuses = {"车辆状态", "EAS(汽车防盗系统)状态", "DCDC(电力交换系统)"};
+//
+//        // 生成随机数对象
+//        Random rand = new Random();
+//
+//        // 生成一个范围在 0 到 2 之间的随机整数
+//        int randomIndex = rand.nextInt(3);
+//
+//        return statuses[randomIndex];
+//    }
+//
+//    public static String getType() {
+//        // 创建一个字符串数组存储三个状态
+//        String[] statuses = {"电池故障", "车体故障", "车尾故障","抽轮故障"};
+//
+//        // 生成随机数对象
+//        Random rand = new Random();
+//
+//        // 生成一个范围在 0 到 2 之间的随机整数
+//        int randomIndex = rand.nextInt(4);
+//
+//        return statuses[randomIndex];
+//    }
+
+
+
     /**
      * 将16进制字符串转换为ASCII字符串
      * @param s 16进制字符串

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

@@ -2,6 +2,7 @@ package com.couplet.analyze.msg.service;
 
 import com.couplet.analyze.msg.contents.MsgContent;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
+import com.couplet.common.domain.request.RealTimeDataRequest;
 
 /**
  * @Author: LiJiaYao
@@ -25,4 +26,5 @@ public interface IncidentService {
 
 
 
+
 }

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

@@ -1,19 +1,47 @@
 package com.couplet.analyze.msg.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.couplet.analyze.msg.contents.StateConstant;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
-import com.couplet.common.log.annotation.Log;
+import com.couplet.common.domain.CoupletTroubleCode;
-import lombok.extern.log4j.Log4j2;
+import com.couplet.remote.RemoteTroubleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
 /**
  * @Author: LiJiaYao
  * @Date: 2024/4/2
  * @Description: 故障事件
  */
 @Service("breakdown")
-@Log4j2
+public class BreakdownServiceImpl extends KeyExpirationEventMessageListener implements IncidentService {
-public class BreakdownServiceImpl implements IncidentService {
+
+    /**
+     * 设置redis存储
+     */
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+    @Autowired
+    private RemoteTroubleService remoteTroubleService;
+
+
+    private static Logger log = LoggerFactory.getLogger(BreakdownServiceImpl.class);
+
+    public BreakdownServiceImpl(RedisMessageListenerContainer listenerContainer) {
+        super(listenerContainer);
+    }
+
+
     /**
      * 故障事件
      *
@@ -23,9 +51,41 @@ public class BreakdownServiceImpl implements IncidentService {
     public void incident(CoupletMsgData coupletMsgData) {
 
         log.info("故障事件开始.....");
+        long l = System.currentTimeMillis();
+        log.info("开始时间是："+l);
+        if (StateConstant.VEHICLE_STATUS != coupletMsgData.getVehicleStatus()
+                || StateConstant.CHARGING_STATUS!=coupletMsgData.getChgStatus()
+                || StateConstant.OPERATING_STATUS!=coupletMsgData.getOperatingStatus()
+                || StateConstant.SOC_STATUS!=coupletMsgData.getSocStatus()
+                || StateConstant.CHARGING_ENERGY_STORAGE_STATUS != coupletMsgData.getChargingEnergyStorageStatus()
+                || StateConstant.DRIVE_MOTOR_STATUS != coupletMsgData.getDriveMotorStatus()
+                || StateConstant.POSITION_STATUS != coupletMsgData.getPositionStatus()
+                || StateConstant.EAS_STATUS != coupletMsgData.getEasStatus()
+                || StateConstant.PTC_STATUS != coupletMsgData.getPtcStatus()
+                || StateConstant.ABS_STATUS != coupletMsgData.getAbsStatus()
+                || StateConstant.MCU_STATUS != coupletMsgData.getMcuStatus()
+                || StateConstant.HEATING_STATUS != coupletMsgData.getHeatingStatus()
+                || StateConstant.BATTERY_STATUS != coupletMsgData.getBatteryStatus()
+                || StateConstant.BATTERY_INSULATION_STATUS != coupletMsgData.getBatteryInsulationStatus()
+                || StateConstant.DCDC_STATUS != coupletMsgData.getDcdcStatus()
+                || StateConstant.CHG_STATUS != coupletMsgData.getChgStatus()){
+                //获取过期的key
+            String key = "breakdown";
+            log.debug("失效+key is:"+ key);
+            String value = JSON.toJSONString(coupletMsgData);
+            redisTemplate.opsForSet().add(key, value);
+            long expireTime = 30;
+            redisTemplate.expire(key, expireTime, TimeUnit.MINUTES);
+            long timeMillis = System.currentTimeMillis();
+            scheduledRedis();
+            log.info("故障事件结束时间："+timeMillis);
+            log.info("故障事件检测结束.....");
+            log.info("故障事件结束.....");
+        }
+        long timeMillis = System.currentTimeMillis();
+        log.info("故障事件结束时间："+timeMillis);
+        log.info("故障事件检测结束.....");
         log.info("故障事件结束.....");
-
-
     }
 
     /**
@@ -35,4 +95,31 @@ public class BreakdownServiceImpl implements IncidentService {
     public String getName() {
         return "breakdown";
     }
+
+    public void scheduledRedis() {
+
+        // Get all members of the set
+        Set<String> members = redisTemplate.opsForSet().members("breakdown");
+        if (members.size()!=0){
+            for (String member : members){
+                CoupletMsgData code = JSON.parseObject(member, CoupletMsgData.class);
+                Set<String> breakdownIds = redisTemplate.opsForSet().members(code.getVin());
+                if (breakdownIds.size()==0){
+                    CoupletTroubleCode troubleCode = new CoupletTroubleCode();
+                    troubleCode.setTroubleStartTime(new Date());
+                    // 插入数据库
+                    troubleCode.setTroubleTag(0);
+                    troubleCode.setTroubleVin(code.getVin());
+                    remoteTroubleService.newFaultData(troubleCode);
+                    redisTemplate.opsForSet().add(code.getVin(), code.getVin()+":"+code);
+                    long expireTime = 30;
+                    redisTemplate.expire(code.getVin(), expireTime, TimeUnit.MINUTES);
+
+                }
+
+            }
+
+        }
+
+    }
 }

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

@@ -3,6 +3,8 @@ package com.couplet.analyze.msg.service.impl;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,6 +16,8 @@ import org.springframework.stereotype.Service;
 @Log4j2
 public class ElectronicFenceServiceImpl implements IncidentService {
 
+    @Autowired
+    private StringRedisTemplate redisTemplate;
 
     /**
      * 电子围栏事件
@@ -24,10 +28,16 @@ public class ElectronicFenceServiceImpl implements IncidentService {
     public void incident(CoupletMsgData coupletMsgData) {
 
         log.info("电子围栏事件开始.......");
+
+        if (redisTemplate.hasKey("fence")) {
+            log.info("电子围栏事件redis存在.......");
+            String s = redisTemplate.opsForValue().get("fence");
+            log.info("更改的电子围栏内容是:"+s);
+            log.info("电子围栏事件结束.......");
+        }
+
         log.info("电子围栏事件结束.......");
 
-
-
     }
 
     /**

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

@@ -1,8 +1,12 @@
 package com.couplet.analyze.msg.service.impl;
 
 import com.couplet.analyze.msg.domain.CoupletMsgData;
+import com.couplet.analyze.msg.mapper.IncidentMapper;
 import com.couplet.analyze.msg.service.IncidentService;
+import com.couplet.analyze.msg.service.impl.realTimeData.RealTimeJudge;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,6 +18,15 @@ import org.springframework.stereotype.Service;
 @Log4j2
 public class RealTimeDataServiceImpl implements IncidentService {
 
+    /**
+     * 查询传入的数据是否存在
+     */
+    @Autowired
+    private IncidentMapper incidentMapper;
+
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
     /**
      * 实时数据事件
      *
@@ -23,6 +36,12 @@ public class RealTimeDataServiceImpl implements IncidentService {
     public void incident(CoupletMsgData coupletMsgData) {
 
         log.info("实时数据事件开始.....");
+
+        if (RealTimeJudge.isJudge(coupletMsgData.getVin())){
+            log.info("[{}]开始传输实时数据", coupletMsgData.getVin());
+        }
+        log.info("[{}]开始传输实时数据", coupletMsgData.getVin());
+
         log.info("实时数据事件结束.....");
 
     }

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

@@ -0,0 +1,19 @@
+package com.couplet.analyze.msg.service.impl.breakdown;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/5
+ * @Description:
+ */
+@Component
+public class BreakdownEvent {
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+
+
+}

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

@@ -0,0 +1,45 @@
+package com.couplet.analyze.msg.service.impl.realTimeData;
+
+
+import com.couplet.analyze.msg.domain.CoupletMsgData;
+import com.couplet.common.domain.request.RealTimeDataRequest;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @Author: LiJiaYao
+ * @Date: 2024/4/4
+ * @Description: 判断实时数据
+ */
+public class RealTimeJudge {
+
+
+    /**
+     * 常量
+     */
+    private static final Map<String, Set<Long>> setMap = new HashMap<>();
+
+    public static boolean isJudge(String vin){
+        return setMap.containsKey(vin);
+    }
+
+    /**
+     *
+     * @param realTimeDataRequest
+     * @return
+     */
+    public static boolean addRealTime(RealTimeDataRequest realTimeDataRequest){
+        Set<Long> userIds = setMap.get(realTimeDataRequest.getVin());
+        if (userIds == null){
+            userIds = new HashSet<>();
+            setMap.put(realTimeDataRequest.getVin(),userIds);
+        }
+        userIds.add(realTimeDataRequest.getUserId());
+        return true;
+    }
+
+
+}

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

@@ -4,7 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.couplet.analyze.msg.mapper.IncidentMapper">
 
-
     <insert id="reportMapper">
         INSERT INTO `couplet-cloud`.`couplet_msg_data`
         (`vin`, `create_time`, `longitude`, `latitude`,
@@ -71,5 +70,10 @@
                 #{brakePedal}
                );
     </insert>
+    <select id="queryByIncident" resultType="com.couplet.analyze.msg.domain.CoupletMsgData"
+            parameterType="com.couplet.common.domain.request.RealTimeDataRequest">
+        SELECT * FROM couplet_msg_data WHERE vin =#{vin}
+    </select>
+
 
 </mapper>

couplet-modules/couplet-analyze/couplet-analyze-msg/src/test/java/com/couplet/msg/Main.java

@@ -1,5 +1,6 @@
 package com.couplet.msg;
 
+import java.util.Random;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -11,18 +12,17 @@ import java.util.regex.Pattern;
  */
 public class Main {
     public static void main(String[] args) {
-        String msgString = "VIN123456789DIJE41711764104506116.664380039.531990072.00031.3760000022000022000852000000D00809.600940000589066790930000203002030000044282.55000014000080700007440003000400095000058000054000011111111111111111";
+        // 创建一个字符串数组存储三个状态
+        String[] statuses = {"电池故障", "车体故障", "车尾故障","抽轮故障"};
 
-        //使用正则表达式匹配需要的部分
+        // 生成随机数对象
-        String pattern = "(.{17})(.{10})(.{4})(.{2})(.{2})";
+        Random rand = new Random();
-        Pattern compile = Pattern.compile(pattern);
-        Matcher matcher = compile.matcher(msgString);
 
-        if (matcher.find()) {
+        // 生成一个范围在 0 到 2 之间的随机整数
-            for (int i = 1; i <= matcher.groupCount(); i++) {
+        int randomIndex = rand.nextInt(4);
-                System.out.println("Group "+ i + ":" + matcher.group(i));
-            }
-        }
 
+        // 随机选择一个字符串并输出
+        String randomStatus = statuses[randomIndex];
+        System.out.println("随机输出的字符串：" + randomStatus);
     }
 }

couplet-modules/couplet-analyze/couplet-analyze-msg/src/test/java/com/couplet/msg/Randoms.java

@@ -0,0 +1,36 @@
+package com.couplet.msg;
+
+import java.util.Random;
+
+/**
+ * @author DongXiaoDong
+ * @version 1.0
+ * @date 2024/4/4 11:34
+ * @description
+ */
+public class Randoms {
+    public static void main(String[] args) {
+        String gtaNumber = generateGTA();
+        System.out.println("随机生成的GTA开头的七位数字：" + gtaNumber);
+    }
+
+    public static String generateGTA() {
+        // 生成四位以"GTA"开头的字符串
+        String prefix = "GTA";
+        // 生成三位随机数字
+        String randomNumber = generateRandomNumber(4);
+        // 拼接字符串
+        return prefix + randomNumber;
+    }
+
+    public static String generateRandomNumber(int length) {
+        // 生成随机数
+        Random random = new Random();
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            // 生成0到9之间的随机数字，并转换为字符串
+            sb.append(random.nextInt(10));
+        }
+        return sb.toString();
+    }
+}

couplet-modules/couplet-business/pom.xml

@@ -87,6 +87,17 @@
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.couplet</groupId>
+            <artifactId>couplet-analyze-msg</artifactId>
+        </dependency>
+
+        <!-- RabbitMQ依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java

@@ -5,6 +5,7 @@ import com.couplet.common.security.annotation.EnableMyFeignClients;
 import com.couplet.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @Author: LiJiaYao
@@ -15,6 +16,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableCustomSwagger2
 @EnableMyFeignClients(basePackages = ("com.couplet"))
 @SpringBootApplication(scanBasePackages = {"com.couplet"})
+@EnableScheduling
 public class CoupletBusinessApplication {
     public static void main (String[] args) {
         SpringApplication.run(CoupletBusinessApplication.class, args);

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/OnLineVehicleController.java

@@ -3,14 +3,8 @@ package com.couplet.business.server.controller;
 import com.couplet.business.server.service.OnLineVehicleService;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.domain.Vehicle;
-import com.couplet.common.domain.request.RealTimeDataRequest;
-import com.couplet.common.security.utils.SecurityUtils;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.amqp.RabbitTemplateConfigurer;
-import org.springframework.data.redis.core.ReactiveRedisOperations;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -28,8 +22,7 @@ public class OnLineVehicleController {
 
     @Autowired
     private OnLineVehicleService onLineVehicleService;
-    @Autowired
+
-    private RabbitTemplate rabbitTemplate;
     @PostMapping("onlineList")
     public Result<List<Vehicle>> onlineList(){
         List<Vehicle> onlineList = onLineVehicleService.onlineList();
@@ -37,14 +30,8 @@ public class OnLineVehicleController {
         return success;
     }
 
-    @PostMapping("/monitorinData")
+
-    public void monitorinData(@RequestBody RealTimeDataRequest realTimeDataRequest){
+
-        String exchangeName = "exchangeName"; // 交换机名称
-        String routingKey = "routingKey"; // 路由键
-        Long userId = SecurityUtils.getUserId();
-        realTimeDataRequest.setUserId(userId);
-        rabbitTemplate.convertAndSend(exchangeName, routingKey, realTimeDataRequest);
-    }
 
 
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java

@@ -6,7 +6,6 @@ import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.controller.BaseController;
 import com.couplet.common.domain.CoupletTroubleCode;
 import com.couplet.common.domain.CoupletTroubleGrade;
-import com.couplet.common.domain.CoupletTroubleType;
 import com.couplet.common.domain.request.TroubleResp;
 import com.couplet.common.log.annotation.Log;
 import com.couplet.common.log.enums.BusinessType;
@@ -37,13 +36,6 @@ public class SysTroubleController extends BaseController {
         return Result.success(result);
     }
 
-    /**
-     * 故障类型信息
-     */
-    @GetMapping("/troubleTypeList")
-    public List<CoupletTroubleType> listType() {
-        return troubleService.selectTroubleListByType();
-    }
 
     /**
      * 故障等级信息
@@ -80,4 +72,14 @@ public class SysTroubleController extends BaseController {
         troubleService.removeById(troubleId);
         return success();
     }
+
+    /**
+     * 删除故障码数据
+     */
+    @Log(title = "新增故障码",businessType = BusinessType.INSERT)
+    @PostMapping("/newFaultData")
+    public Result<?> newFaultData(@RequestBody CoupletTroubleCode code) {
+        troubleService.newFaultData(code);
+        return success();
+    }
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleController.java

@@ -174,8 +174,21 @@ public class VehicleController extends BaseController {
 
 
 
+    /*
+     * @Author: LiuYunHu
+     * @Date: 2024/4/4 11:28
+     * @Description:  通过vin修改车辆上下线的状态
+     * @Param:
+     * @Return:
+     **/
+    @GetMapping("onOrOutLineByVIN")
+    public Integer onOrOutLineByVIN(@RequestParam("params") String params) {
+        String[] split = params.split(",");
 
 
+        return vehicleService.onOrOutLineByVIN(split[0], Integer.parseInt(split[1]));
+    }
+
 
 
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleDetectionController.java

@@ -2,14 +2,17 @@ package com.couplet.business.server.controller;
 
 import com.couplet.business.server.service.VehicleDetectionService;
 import com.couplet.common.core.domain.Result;
+import com.couplet.common.domain.CoupletVehicleData;
 import com.couplet.common.domain.Vehicle;
 import com.couplet.common.domain.request.RealTimeDataRequest;
 import com.couplet.common.security.utils.SecurityUtils;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author fufanrui
@@ -23,10 +26,14 @@ import java.util.List;
 public class VehicleDetectionController {
 
 
+
     @Autowired
     private VehicleDetectionService vehicleDetectionService;
     @Autowired
     private RabbitTemplate rabbitTemplate;
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+    private final String REDIS_LIST_KEY = "coupletMsgData";
     /*
      * @param :
       * @return Result<List<Vehicle>>
@@ -58,4 +65,9 @@ public class VehicleDetectionController {
         rabbitTemplate.convertAndSend(exchangeName, routingKey, realTimeDataRequest);
     }
 
+
+
+
+
+
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenceMapper.java

@@ -1,7 +1,6 @@
 package com.couplet.business.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import com.couplet.common.domain.Fence;
 import com.couplet.common.domain.request.FenceConfig;
 import com.couplet.common.domain.request.FenceRequest;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java

@@ -23,6 +23,13 @@ public interface SysTroubleMapper extends BaseMapper<CoupletTroubleCode> {
 
     List<CoupletTroubleGrade> selectTroubleListByGrade();
 
+    /**
+     * 新增故障码数据
+     * @param code
+     */
+    void newFaultData(CoupletTroubleCode code);
+
+
 //    int addTrouble(TroubleAddReq troubleAddReq);
 
 //    int updateTrouble(TroubleUpdReq troubleUpdReq);

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleDetectionMapper.java

@@ -9,5 +9,5 @@ import java.util.List;
 public interface VehicleDetectionMapper {
     List<Vehicle> detectionList();
 
-    List<Vehicle> findByVin(Integer vehicleId);
+    List<Vehicle> findByVin(String vehicleId);
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleMapper.java

@@ -22,10 +22,9 @@ public interface VehicleMapper extends BaseMapper<Vehicle> {
 
     Integer deleteVehicle(Long middleId);
 
-
+    Integer addVehicle(VehicleMiddle vehicleMiddle);
 
     List<Vehicle> vehicleAll();
 
-    Integer addVehicle(@Param("userId") Long userId, @Param("vehicleIds") List<Long> vehicleIds);
+    Integer onOrOutLineByVIN(@Param("vin") String vin, @Param("status") int status);
-
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/LogoService.java

@@ -3,7 +3,6 @@ package com.couplet.business.server.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.couplet.common.domain.Logo;
 
-
 import java.util.List;
 
 /**

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java

@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.couplet.common.core.domain.PageResult;
 import com.couplet.common.domain.CoupletTroubleCode;
 import com.couplet.common.domain.CoupletTroubleGrade;
-import com.couplet.common.domain.CoupletTroubleType;
 import com.couplet.common.domain.request.TroubleResp;
 
-
 import java.util.List;
 
 /**
@@ -19,10 +17,15 @@ import java.util.List;
 public interface SysTroubleService extends IService<CoupletTroubleCode> {
     PageResult<CoupletTroubleCode> selectTroubleList(TroubleResp troubleReq);
 
-    List<CoupletTroubleType> selectTroubleListByType();
-
     List<CoupletTroubleGrade> selectTroubleListByGrade();
 
+    /**
+     * 新增故障数据
+     * @param code
+     */
+    void newFaultData(CoupletTroubleCode code);
+
+
 //    int addTrouble (TroubleAddReq troubleAddReq);
 
 //    int updateTrouble(TroubleUpdReq troubleUpdReq);

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleAndLogoService.java

@@ -3,7 +3,6 @@ package com.couplet.business.server.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.couplet.common.domain.VehicleAndLogo;
 
-
 import java.util.List;
 
 /**

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleDetectionService.java

@@ -9,5 +9,4 @@ public interface VehicleDetectionService {
 
     List<Vehicle> detectionList();
 
-    List<Vehicle> findByVin(Integer vehicleId);
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleService.java

@@ -37,4 +37,6 @@ public interface VehicleService extends IService<Vehicle> {
 
     List<Vehicle> vehicleAll();
 
+    Integer onOrOutLineByVIN(String s, int i);
+
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleTypeService.java

@@ -3,7 +3,6 @@ package com.couplet.business.server.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.couplet.common.domain.VehicleType;
 
-
 import java.util.List;
 
 /**

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.couplet.business.server.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.couplet.business.server.mapper.FenceMapper;
 import com.couplet.business.server.service.FenAndLogoService;
@@ -8,12 +9,15 @@ import com.couplet.common.domain.Fence;
 import com.couplet.common.domain.request.FenceConfig;
 import com.couplet.common.domain.request.FenceRequest;
 import com.couplet.common.domain.request.FenceUpdateRequest;
+import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.mq.remote.RemoteFenceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Author: LiJiaYao
@@ -38,45 +42,66 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
      */
     @Autowired
     private StringRedisTemplate redisTemplate;
+    /**
+     * 远程调用队列服务
+     */
+    @Autowired
+    private RemoteFenceService remoteFenceService;
 
     @Override
     public List<Fence> pageQuery(FenceConfig fenceConfig) {
-        List<Fence> list= fenceMapper.pageQuery(fenceConfig);
+        List<Fence> list = fenceMapper.pageQuery(fenceConfig);
         return list;
     }
 
     @Override
     public void changeFenceStatus(FenceUpdateRequest fenceUpdateRequest) {
 
+        String username = SecurityUtils.getUsername();
+        fenceUpdateRequest.setCrateName(username);
         fenceMapper.changeFence(fenceUpdateRequest);
+        /**
+         * 电子围栏发送改变
+         */
+        redisTemplate.opsForValue().set("changeFenceStatus", JSON.toJSONString(fenceUpdateRequest), 10, TimeUnit.MINUTES);
 
+        remoteFenceService.fenceQueue(fenceUpdateRequest);
     }
 
     /**
      * 业务实现:添加围栏
+     *
      * @param request
      * @param fenceRequest
      */
     @Override
     public void fenceInsert(HttpServletRequest request, FenceRequest fenceRequest) {
-
+        String username = SecurityUtils.getUsername();
+        fenceRequest.setCrateName(username);
         //先添加围栏
-        int a= fenceMapper.insertFence(fenceRequest);
+        fenceMapper.insertFence(fenceRequest);
         String[] logoIds = fenceRequest.getLogoIds();
         String[] parts = new String[0];
         for (String logoId : logoIds) {
             //把前台传入的字符串分割成数组
-          parts = logoId.split(",");
+            parts = logoId.split(",");
-          //再添加围栏和标识中间表
+            //再添加围栏和标识中间表
-          fenAndLogoService.addBach(fenceRequest.getFenceId(),parts);
+            fenAndLogoService.addBach(fenceRequest.getFenceId(), parts);
-
         }
-
+        /**
+        * 电子围栏发送改变
+        */
+        redisTemplate.opsForValue().set("fenceInsert", JSON.toJSONString(fenceRequest), 10, TimeUnit.MINUTES);
     }
 
     @Override
     public void removeByFenceId(Long fenceId) {
         fenceMapper.removeByFenceId(fenceId);
+        /**
+         * 电子围栏发送改变
+         */
+        redisTemplate.opsForValue().set("removeByFenceId", JSON.toJSONString(fenceId), 10, TimeUnit.MINUTES);
+
     }
 
     @Override

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/ManageServiceImpl.java

@@ -7,7 +7,6 @@ import com.couplet.common.system.domain.LoginUser;
 import com.couplet.common.system.domain.SysDept;
 import com.couplet.common.system.remote.RemoteDeptService;
 import com.couplet.common.system.remote.RemoteUserService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/SysTroubleServiceImpl.java

@@ -6,7 +6,6 @@ import com.couplet.business.server.service.SysTroubleService;
 import com.couplet.common.core.domain.PageResult;
 import com.couplet.common.domain.CoupletTroubleCode;
 import com.couplet.common.domain.CoupletTroubleGrade;
-import com.couplet.common.domain.CoupletTroubleType;
 import com.couplet.common.domain.request.TroubleResp;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -40,16 +39,17 @@ public class SysTroubleServiceImpl extends ServiceImpl<SysTroubleMapper, Couplet
         return PageResult.toPageResult(info.getTotal(),troubleList);
     }
 
-    @Override
-    public List<CoupletTroubleType> selectTroubleListByType() {
-        return sysTroubleMapper.selectTroubleListByType();
-    }
 
     @Override
     public List<CoupletTroubleGrade> selectTroubleListByGrade() {
         return sysTroubleMapper.selectTroubleListByGrade();
     }
 
+    @Override
+    public void newFaultData(CoupletTroubleCode code) {
+        sysTroubleMapper.newFaultData(code);
+    }
+
     /**
      * 新增故障码数据
 //     * @param troubleAddReq

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java

@@ -27,8 +27,4 @@ public class VehicleDetectionServiceImpl implements VehicleDetectionService{
         return vehicleDetectionMapper.detectionList();
     }
 
-    @Override
-    public List<Vehicle> findByVin(Integer vehicleId) {
-        return vehicleDetectionMapper.findByVin(vehicleId);
-    }
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleManageServiceImpl.java

@@ -61,6 +61,8 @@ public class VehicleManageServiceImpl implements VehicleManageService {
      */
     @Override
     public Result addVehicle(VehicleMiddle middle) {
+        Long userId = SecurityUtils.getUserId();
+        middle.setUserId(userId);
         Result<Integer> integerResult = remoteVehicleService.addVehicle(middle);
         Integer resultData = integerResult.getData();
         return resultData==1?Result.success():Result.error("添加失败");

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java

@@ -16,7 +16,6 @@ import com.couplet.common.domain.VehicleType;
 import com.couplet.common.domain.request.VehicleEditParams;
 import com.couplet.common.domain.request.VehicleInsertParams;
 import com.couplet.common.domain.request.VehicleListParams;
-import com.couplet.common.security.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -274,8 +273,8 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
 
     @Override
     public Integer addVehicle(VehicleMiddle vehicleMiddle) {
-        Long userId = SecurityUtils.getUserId();
+
-        return vehicleMapper.addVehicle(userId,vehicleMiddle.getVehicleIds());
+        return vehicleMapper.addVehicle(vehicleMiddle);
     }
 
     @Override
@@ -283,6 +282,14 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
         return vehicleMapper.vehicleAll();
     }
 
+
+    //通过vin修改车辆上下线的状态
+    @Override
+    public Integer onOrOutLineByVIN(String vin, int status) {
+
+        return vehicleMapper.onOrOutLineByVIN(vin, status);
+    }
+
     @Override
     public List<Vehicle> findByVIN(String vin) {
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/time/Timer.java

@@ -0,0 +1,62 @@
+package com.couplet.business.server.time;
+
+import com.couplet.business.server.service.VehicleService;
+import com.couplet.common.domain.Vehicle;
+import com.couplet.common.domain.request.VehicleListParams;
+import com.couplet.common.redis.service.RedisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ProjectName: five-groups-couplet
+ * @Author: LiuYunHu
+ * @CreateTime: 2024/4/4
+ * @Description: 车辆定时器
+ */
+@Component
+@Slf4j
+public class Timer {
+    //redis
+    @Autowired
+    private RedisService redis;
+    //查询车辆列表
+    @Autowired
+    private VehicleService vehicleService;
+
+
+    //判断车辆是否下线
+    @Scheduled(cron = "* * * * * *")
+    public void outLine() {
+        log.info("定时器启动");
+
+        //先查询车辆列表
+        List<Vehicle> list = vehicleService.list(new VehicleListParams(null, null, null, null));
+
+        list.forEach(vehicle -> {
+
+            //只针对已经上线的车辆
+            if (redis.hasKey(vehicle.getVin())) {
+
+                //如果vin的缓存 时间还剩一秒，则判断为已经下线
+                if (redis.getExpire(vehicle.getVin()) <= 3) {
+                    log.info(vehicle.getVin() + "的车辆已经下线");
+
+                    //执行修改下线状态的方法
+                    Integer i = vehicleService.onOrOutLineByVIN(vehicle.getVin(), 0);
+
+                    if (0 == 1) {
+                        log.error("下线状态修改失败");
+                    }
+
+                    log.info("下线状态修改成功");
+                }
+            }
+
+
+        });
+    }
+}

couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml

@@ -14,6 +14,7 @@
         <result property="updateTime" column="update_time" />
         <result property="isDelete" column="is_delete" />
         <result property="maintainerName" column="maintainer_name" />
+        <result property="fenceCondition" column="fence_condition" />
     </resultMap>
     <resultMap id="logoMap" type="com.couplet.common.domain.Logo">
         <id property="logoId" column="logo_id"/>

couplet-modules/couplet-business/src/main/resources/mapper/business/FenceMapper.xml

@@ -14,6 +14,7 @@
         <result property="updateTime" column="update_time" />
         <result property="isDelete" column="is_delete" />
         <result property="maintainerName" column="maintainer_name" />
+        <result property="fenceCondition" column="fence_condition" />
     </resultMap>
     <resultMap id="logoMap" type="com.couplet.common.domain.Logo">
         <id property="logoId" column="logo_id"/>
@@ -32,6 +33,7 @@
             create_name,
             maintainer_name,
             alarm_status,
+            fence_condition,
             l.logo_id,
             GROUP_CONCAT(logo_name) as logoName
         FROM couplet_fence_info f INNER JOIN couplet_fences_and_logo m on
@@ -49,16 +51,17 @@
             update_time,
             create_name,
             maintainer_name,
-            alarm_status
+            alarm_status,
+            fence_condition
         FROM couplet_fence_info
     </sql>
     <insert id="insertFence" parameterType="com.couplet.common.domain.request.FenceRequest" keyProperty="fenceId"
             useGeneratedKeys="true">
         INSERT INTO `couplet-cloud`.`couplet_fence_info`
             (`fence_name`, `fence_longitude_latitude`, `fence_description`, `is_delete`, `fence_state`, `create_time`,
-             `update_time`, `create_name`, `maintainer_name`, `alarm_status`)
+             `update_time`, `create_name`, `maintainer_name`, `alarm_status`,`fence_condition`)
         VALUES
-            (#{fenceName}, null, #{fenceDescription}, 0, 0, now(), null, null, #{maintainerName}, 0)
+            (#{fenceName}, null, #{fenceDescription}, 0, 0, now(), null, null, #{maintainerName}, 0 ,0)
 
 
     </insert>
@@ -73,7 +76,8 @@
                 `fence_state` = #{fenceState},
                 `update_time` = now(),
                 `maintainer_name` = 'admin',
-                `alarm_status` = #{alarmStatus}
+                `alarm_status` = #{alarmStatus},
+                `fence_condition` = #{fenceCondition}
             WHERE `fence_id` = #{fenceId}
 
     </update>

couplet-modules/couplet-business/src/main/resources/mapper/business/SysTroubleMapper.xml

@@ -12,6 +12,7 @@
         <result property="troubleTag" column="trouble_tag"/>
         <result property="typeId" column="type_id"/>
         <result property="gradeId" column="grade_id"/>
+        <result property="troubleType" column="trouble_type"/>
     </resultMap>
 
     <sql id="selectTroubleVo">
@@ -19,6 +20,13 @@
         LEFT JOIN couplet_trouble_grade g on t.grade_id = g.grade_id
         LEFT JOIN couplet_trouble_type y on t.type_id= y.type_id
     </sql>
+    <insert id="newFaultData">
+        INSERT INTO `couplet-cloud`.`couplet_trouble_code`
+            (`trouble_vin`, `trouble_tag`,
+             `trouble_start_time`)
+        VALUES
+            (#{troubleVin}, #{troubleTag}, #{troubleStartTime})
+    </insert>
 
     <select id="selectTroubleList" parameterType="com.couplet.business.server.mapper.SysTroubleMapper" resultMap="SysTroubleResult">
         <include refid="selectTroubleVo"/>

couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleMapper.xml

@@ -41,16 +41,19 @@
     </sql>
     <insert id="addVehicle">
         INSERT INTO `couplet-cloud`.`couplet_middle` (`user_id`, `vehicle_id`, `del_flag`) VALUES
-        <foreach collection="vehicleIds" item="singleVehicleId" separator=",">
+        <foreach collection="vehicleId" item="vehicleId" separator=",">
-            (#{userId}, #{singleVehicleId}, 0)
+            (#{userId}, #{vehicleId}, 0)
         </foreach>
     </insert>
-<!--    <insert id="addVehicle" useGeneratedKeys="true" keyProperty="vehicleId">-->
+
-<!--        INSERT INTO `couplet-cloud`.`couplet_middle` (`user_id`, `vehicle_id`, `del_flag`) VALUES-->
+
-<!--        <foreach collection="vehicleId" item="vehicleId" separator=",">-->
+    <update id="onOrOutLineByVIN">
-<!--            (#{userId}, #{vehicleId}, 0)-->
+        UPDATE `couplet-cloud`.`couplet_vehicle`
-<!--        </foreach>-->
+        SET `vehicle_state` = #{status}
-<!--    </insert>-->
+        WHERE `vin` = #{vin};
+    </update>
+
+
     <delete id="deleteVehicle">
         update couplet_middle
         set del_flag = '2'

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

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -17,15 +17,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-  main:
-    allow-bean-definition-overriding: true

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

@@ -4,8 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-job
@@ -17,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-modules-mq/pom.xml

@@ -106,6 +106,15 @@
             <groupId>com.couplet</groupId>
             <artifactId>couplet-common-business</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.kafka</groupId>-->
+<!--            <artifactId>spring-kafka</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>2.8.0</version>
+        </dependency>
     </dependencies>
 
     <build>

couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/config/RabbitMQConfig.java

@@ -25,16 +25,22 @@ import org.springframework.context.annotation.Primary;
 public class RabbitMQConfig implements RabbitTemplate.ConfirmCallback, RabbitTemplate.ReturnsCallback {
     // 通过注入的方式获取队列名、交换机名和路由键
     //队列名
-    @Value("${mq.queueName}")
+    @Value("queueName")
     public String queueName;
 
+    //队列名
+    public static final String FENCE_QUEUE ="fenceQueue";
+
     //交换机
-    @Value("${mq.exchangeName}")
+    @Value("exchangeName")
     public String exchangeName;
+    public static final String FENCE_EXCHANGE="fenceExchange";
 
     //路由键
-    @Value("${mq.routingKey}")
+    @Value("routingKey")
     public String routingKey;
+    //路由键
+    public static final String FENCE_ROUTINGKEY="fenceRoutingKey";
 
     private RabbitTemplate rabbitTemplate;
 
@@ -61,6 +67,10 @@ public class RabbitMQConfig implements RabbitTemplate.ConfirmCallback, RabbitTem
     public Queue queue() {
         return new Queue(queueName, true);
     }
+    @Bean("fenceQueue")
+    public Queue queue2() {
+        return new Queue(FENCE_QUEUE, true);
+    }
 
     /*
      * @Author: LiuYunHu
@@ -74,6 +84,11 @@ public class RabbitMQConfig implements RabbitTemplate.ConfirmCallback, RabbitTem
         return new DirectExchange(exchangeName);
     }
 
+    @Bean("fenceExchange")
+    public DirectExchange directExchange2() {
+        return new DirectExchange(FENCE_EXCHANGE);
+    }
+
     /*
      * @Author: LiuYunHu
      * @Date: 2024/3/29 21:27
@@ -116,6 +131,11 @@ public class RabbitMQConfig implements RabbitTemplate.ConfirmCallback, RabbitTem
         return BindingBuilder.bind(queue()).to(directExchange()).with(routingKey);
     }
 
+    @Bean("fenceRoutingKey")
+    public Binding binding2() {
+        return BindingBuilder.bind(queue2()).to(directExchange2()).with(FENCE_ROUTINGKEY);
+    }
+
     /*
      * @Author: LiuYunHu
      * @Date: 2024/3/29 21:28

couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/controller/KafkaTest.java

@@ -0,0 +1,54 @@
+package com.couplet.mq.controller;
+
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Properties;
+
+/**
+ * @author DongXiaoDong
+ * @version 1.0
+ * @date 2024/4/5 21:38
+ * @description
+ */
+public class KafkaTest {
+    private static final String TOPIC_NAME = "online";
+    private static final String BOOTSTRAP_SERVERS = "39.103.133.136:9092";
+
+    public static void main(String[] args) {
+        aaa();
+    }
+
+    private static void aaa() {
+        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");
+
+        //创建消费者
+        KafkaConsumer<String, String> consumer = new KafkaConsumer<>(props);
+
+        try {
+
+            //订阅主题
+            consumer.subscribe(Collections.singletonList("online"));
+
+            //持续消费消息
+            while (true) {
+                ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
+                records.forEach(record -> {
+                    System.out.println("消费者接受到的消息值：" + record.value());
+                });
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            consumer.close();
+        }
+    }
+
+}

couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/controller/MqController.java

@@ -1,15 +1,20 @@
 package com.couplet.mq.controller;
 
 import com.couplet.common.core.utils.uuid.IdUtils;
+import com.couplet.common.domain.request.FenceUpdateRequest;
 import com.couplet.common.domain.request.RealTimeDataRequest;
 import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.mq.config.RabbitMQConfig;
 import com.couplet.mq.domain.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @ProjectName: five-groups-couplet
@@ -23,17 +28,17 @@ import org.springframework.web.bind.annotation.*;
 public class MqController {
     // 通过注入的方式获取队列名、交换机名和路由键
     //队列名
-    @Value("${mq.queueName}")
+    @Value("queueName")
-    public static final String queueName="queueName";
+    public String queueName;
-    @Value("${mq.finByVinQueueName}")
+    @Value("finByVinQueueName")
-    public static final String finByVinQueueName="finByVinQueueName";
+    public String finByVinQueueName;
     //交换机
-    @Value("${mq.exchangeName}")
+    @Value("exchangeName")
-    public static final String exchangeName="exchangeName";
+    public String exchangeName;
 
     //路由键
-    @Value("${mq.routingKey}")
+    @Value("routingKey")
-    public static final String routingKey="routingKey";
+    public String routingKey;
 
     @Autowired
     private RabbitTemplate rabbitTemplate;
@@ -57,13 +62,19 @@ public class MqController {
     }
 
 
-    @PostMapping("findByVin/{vin}")
+    @PostMapping("findByVin")
-    public void postFindByVin(@PathVariable String vin){
+    public void postFindByVin(@RequestBody RealTimeDataRequest request){
-        RealTimeDataRequest realTimeDataRequest = new RealTimeDataRequest();
         Long userId = SecurityUtils.getUserId();
-        realTimeDataRequest.setUserId(userId);
+        request.setUserId(userId);
-        realTimeDataRequest.setVin(vin);
+        rabbitTemplate.convertAndSend(exchangeName, routingKey, request, message -> {
-        rabbitTemplate.convertAndSend(exchangeName, routingKey, realTimeDataRequest, message -> {
+                    message.getMessageProperties().setMessageId(IdUtils.randomUUID());
+                    return message;
+                }, new CorrelationData(IdUtils.randomUUID())
+        );
+    }
+    @PostMapping("fenceQueue")
+    public void fenceQueue(@RequestBody FenceUpdateRequest fenceUpdateRequest){
+        rabbitTemplate.convertAndSend(RabbitMQConfig.FENCE_EXCHANGE, RabbitMQConfig.FENCE_ROUTINGKEY, fenceUpdateRequest, message -> {
                     message.getMessageProperties().setMessageId(IdUtils.randomUUID());
                     return message;
                 }, new CorrelationData(IdUtils.randomUUID())

couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/remote/RemoteFenceService.java

@@ -0,0 +1,19 @@
+package com.couplet.mq.remote;
+
+import com.couplet.common.core.constant.ServiceNameConstants;
+import com.couplet.common.domain.request.FenceUpdateRequest;
+import com.couplet.mq.remote.factory.RemoteFenceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(contextId = "remoteVehicleService" ,
+        value = ServiceNameConstants.BUSINESS_SERVICE,
+        fallbackFactory = RemoteFenceFallbackFactory.class
+)
+public interface RemoteFenceService {
+
+    @PostMapping("/mq/fenceQueue")
+    public void fenceQueue(@RequestBody FenceUpdateRequest fenceUpdateRequest);
+
+}

couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/remote/factory/RemoteFenceFallbackFactory.java

@@ -0,0 +1,33 @@
+package com.couplet.mq.remote.factory;
+
+import com.couplet.common.domain.request.FenceUpdateRequest;
+import com.couplet.mq.remote.RemoteFenceService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import static com.couplet.common.core.domain.Result.error;
+
+/**
+ * @author fufanrui
+ * @version 1.0
+ * @description: TODO
+ * @date 2024/4/2 14:46
+ */
+@Component
+public class RemoteFenceFallbackFactory implements FallbackFactory<RemoteFenceService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteFenceFallbackFactory.class);
+
+
+    @Override
+    public RemoteFenceService create(Throwable cause) {
+        return new RemoteFenceService() {
+
+            @Override
+            public void fenceQueue(FenceUpdateRequest fenceUpdateRequest) {
+                error("调用失败...."+cause.getMessage());
+            }
+        };
+    }
+}

couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/service/Consumer.java

@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
 @Component
 @Slf4j
 @SuppressWarnings("all")
-@RabbitListener(queues = "${mq.queueName}")
+@RabbitListener(queues = "queueName")
 public class Consumer {
     @Autowired
     private StringRedisTemplate redis;

couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/service/MqConsumer.java

@@ -0,0 +1,164 @@
+package com.couplet.mq.service;
+
+import com.couplet.mq.domain.User;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @ProjectName: five-groups-couplet
+ * @Author: LiuYunHu
+ * @CreateTime: 2024/3/28
+ * @Description: MQ消费者类
+ */
+
+@Component
+@Slf4j
+@SuppressWarnings("all")
+@RabbitListener(queues = "${mq.queueName}")
+public class MqConsumer {
+    @Autowired
+    private StringRedisTemplate redis;
+
+    /* 线程池执行
+
+    //创建一个定长线程池
+    private final Executor executor = Executors.newFixedThreadPool(5);
+
+    @Async
+    @RabbitHandler
+    public void process(User param, Channel channel, Message message) {
+        executor.execute(() -> {
+            try {
+                handleMessage(param, channel, message);
+            } catch (IOException e) {
+                log.error("处理消息失败：{}", e);
+            }
+        });
+    }
+
+    //处理信息的方法
+    private void handleMessage(User param, Channel channel, Message message) throws IOException {
+        log.info("消费者收到消息为：{},{}" + param, message.getMessageProperties().getDeliveryTag());
+
+        long deliveryTag = message.getMessageProperties().getDeliveryTag();
+        String messageId = message.getMessageProperties().getMessageId();
+
+        if (!redis.hasKey("value:" + messageId)) {
+            redis.opsForValue().set("value:" + messageId, "" + deliveryTag, 5, TimeUnit.MINUTES);
+        }
+
+        // 1 添加成功新数据  0已有重复值,不允许再添加
+        Long add = redis.opsForSet().add("set:" + messageId, "set:" + messageId);
+        //过期时间
+        redis.expire("set:" + messageId, 5, TimeUnit.MINUTES);
+
+
+        try {
+            if (add == 1) {
+                //第一次    消费
+                System.out.println("*****************************");
+                System.out.println("消费者收到消息：" + param);
+                System.out.println("*****************************");
+                log.info("消费结束");
+
+                channel.basicAck(deliveryTag, false);
+
+            } else {
+                //重复消费
+                log.error("重复消费");
+                channel.basicReject(deliveryTag, false);
+
+                //删除缓存
+                redis.opsForSet().remove("set:" + messageId, "set:" + messageId);
+            }
+
+
+        } catch (Exception e) {
+            log.error("消息没有成功消费！");
+
+            String s = redis.opsForValue().get("value:" + messageId);
+
+            long oldTag = Long.parseLong(s);
+
+            if (deliveryTag == (oldTag + 2)) {
+                log.error("确实消费不了，不入队了！");
+                channel.basicNack(deliveryTag, false, false);
+            } else {
+                log.info("消息消费失败，重新入队");
+                channel.basicNack(deliveryTag, false, true);
+            }
+        }
+
+    }
+
+**/
+
+    @RabbitHandler
+    public void process(User param, Channel channel, Message message) throws IOException {
+        log.info("消费者收到消息为：{},{}" + param, message.getMessageProperties().getDeliveryTag());
+
+        long deliveryTag = message.getMessageProperties().getDeliveryTag();
+        String messageId = message.getMessageProperties().getMessageId();
+
+        if (!redis.hasKey("value:" + messageId)) {
+            redis.opsForValue().set("value:" + messageId, "" + deliveryTag, 5, TimeUnit.MINUTES);
+        }
+
+        // 1 添加成功新数据  0已有重复值,不允许再添加
+        Long add = redis.opsForSet().add("set:" + messageId, "set:" + messageId);
+        //过期时间
+        redis.expire("set:" + messageId, 5, TimeUnit.MINUTES);
+
+
+        try {
+            if (add == 1) {
+                //第一次    消费
+                System.out.println("*****************************");
+                System.out.println("消费者收到消息：" + param);
+                System.out.println("*****************************");
+                log.info("消费结束");
+
+                //确认消费
+                channel.basicAck(deliveryTag, false);
+
+            } else {
+                //重复消费
+                log.error("重复消费");
+                //拒绝消费
+                channel.basicReject(deliveryTag, false);
+
+                //删除缓存
+                redis.opsForSet().remove("set:" + messageId, "set:" + messageId);
+            }
+
+
+        } catch (Exception e) {
+            log.error("消息没有成功消费！");
+
+            String s = redis.opsForValue().get("value:" + messageId);
+
+            long oldTag = Long.parseLong(s);
+
+            if (deliveryTag == (oldTag + 2)) {
+                log.error("确实消费不了，不入队了！");
+
+
+                //拒绝消费
+                channel.basicNack(deliveryTag, false, false);
+            } else {
+                log.info("消息消费失败，重新入队");
+                //重新入队
+                channel.basicNack(deliveryTag, false, true);
+            }
+        }
+    }
+}

couplet-modules/couplet-modules-mq/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
         # 共享配置
@@ -27,6 +25,9 @@ spring:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   main:
     allow-bean-definition-overriding: true
+
+
+
 logging:
   level:
     com.couplet.system.mapper: DEBUG
@@ -47,3 +48,5 @@ mq:
   queueName: queue
   exchangeName: exchange
   routingKey: routingKey
+
+

couplet-modules/couplet-modules-onLine/pom.xml

@@ -97,6 +97,18 @@
             <artifactId>couplet-common-business</artifactId>
         </dependency>
 
+
+        <!-- Kafka依赖-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.kafka</groupId>-->
+        <!--            <artifactId>spring-kafka</artifactId>-->
+        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/OnlineApplication.java

@@ -5,6 +5,7 @@ import com.couplet.common.security.annotation.EnableMyFeignClients;
 import com.couplet.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @ProjectName: Default (Template) Project
@@ -17,6 +18,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @EnableCustomSwagger2
 @EnableMyFeignClients
 @SpringBootApplication
+@EnableScheduling
 //@EnableFeignClients
 public class OnlineApplication {
     public static void main(String[] args) {

couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java

@@ -1,18 +1,23 @@
 package com.couplet.online.utils;
 
-import com.alibaba.fastjson2.JSON;
 import com.couplet.common.domain.Vehicle;
-import com.couplet.common.redis.service.RedisService;
 import com.couplet.remote.RemoteVehicleService;
+import com.fasterxml.jackson.databind.ser.std.StringSerializer;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.kafka.clients.producer.KafkaProducer;
+import org.apache.kafka.clients.producer.ProducerConfig;
+import org.apache.kafka.clients.producer.ProducerRecord;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @ProjectName: five-groups-couplet
@@ -66,7 +71,12 @@ public class MqttMonitor {
 
     //redis
     @Autowired
-    private RedisService redis;
+    private StringRedisTemplate redis;
+
+
+    //Kafka生产者配置
+    private static final String TOPIC_NAME = "online";
+    private static final String BOOTSTRAP_SERVERS = "39.103.133.136:9092";
 
 
     //随项目启动而执行这个方法
@@ -132,33 +142,54 @@ public class MqttMonitor {
 
                     log.info("当前车辆的vin码为：" + start17);
 
-                    //判断缓存中是否有这个vin
+//                    //判断缓存中是否有这个vin
-                    if (redis.hasKey("不存在的车辆VIN：" + start17)) {
+//                    if (redis.hasKey("不存在的车辆VIN" + start17)) {
+//
+//                        //可使用RabbitMQ发送消息
+//                        log.error("vin码为" + start17 + "的车辆不属于本系统！");
+//
+//                    } else {//如果缓存中没有存这个vin
+//
+//
+//                    }
 
-                        //可使用RabbitMQ发送消息
-                        log.error("vin码为" + start17 + "的车辆不属于本系统！");
-                    }
 
                     //调取接口，通过vin查询车辆
                     List<Vehicle> vehicles = remoteVehicleService.findByVIN(start17).getData();
+                    System.out.println("**************" + vehicles);
+
 
                     //如果不存在这个车
-                    if (vehicles.isEmpty()) {
+                    if (0 == vehicles.size()) {
                         //将不属于自己系统的车辆存入缓存，便于提前进行拒绝提示
-                        redis.setCacheObject("不存在的车辆VIN：" + start17, start17);
+//                        redis.setCacheObject("不存在的车辆VIN" + start17, start17);
                         log.error("未找到vin码为" + start17 + "的车辆信息");
                     } else {
                         //如果存在这个车
                         Vehicle vehicle = vehicles.get(0);
-                        System.out.println("***********" + vehicle + "***********");
+                        log.info("远程调用查询到的车辆数据：" + vehicle);
-                        //存入redis
+
-                        redis.setCacheObject("存在的车辆VIN：" + start17, JSON.toJSONString(vehicle));
+                        //上线车辆存入redis   6秒    用于判断车辆是否下线，还要写定时器，定时查询
+                        redis.opsForValue().set(start17, start17, 6L, TimeUnit.SECONDS);
+
 
                         log.info("vin码为" + start17 + "的车辆属于本系统，允许上线！");
 
-                    }
+                        //调用上线接口，修改上线状态
+                        Integer i = remoteVehicleService.onOrOutLineByVIN(start17 + "," + 1);
+                        //上线成功
+                        if (0 != i) {
+                            log.info("上线成功！");
+                            try {
+                                produceMessage(message);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
 
 
+                    }
+
                 }
 
                 @Override
@@ -176,4 +207,27 @@ public class MqttMonitor {
         }
     }
 
+
+    //Kafka生产者
+    private static void produceMessage(String message) {
+        Properties props = new Properties();
+        props.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, BOOTSTRAP_SERVERS);
+        props.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+        props.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringSerializer");
+
+        KafkaProducer<String, String> producer = new KafkaProducer<>(props);
+        //创建生产者
+        try {
+
+            //发送消息
+            producer.send(new ProducerRecord<>(TOPIC_NAME, message));
+
+            System.out.println("发送消息：" + message);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            producer.close();
+        }
+    }
 }

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

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

@@ -4,7 +4,6 @@ server:
 
 # Spring
 spring:
-
   application:
     # 应用名称
     name: couplet-system
@@ -16,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
+        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
+        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

pom.xml

@@ -211,47 +211,47 @@
                 <artifactId>couplet-modules-system</artifactId>
                 <version>${couplet.version}</version>
             </dependency>
-            <dependency>
+<!--            <dependency>-->
-                <groupId>com.couplet</groupId>
+<!--                <groupId>com.couplet</groupId>-->
-                <artifactId>couplet-trouble</artifactId>
+<!--                <artifactId>couplet-trouble</artifactId>-->
-                <version>${couplet.version}</version>
+<!--                <version>${couplet.version}</version>-->
-            </dependency>
+<!--            </dependency>-->
-            <dependency>
+<!--            <dependency>-->
-                <groupId>com.couplet</groupId>
+<!--                <groupId>com.couplet</groupId>-->
-                <artifactId>couplet-electronic-fence-server</artifactId>
+<!--                <artifactId>couplet-electronic-fence-server</artifactId>-->
-                <version>${couplet.version}</version>
+<!--                <version>${couplet.version}</version>-->
-            </dependency>
+<!--            </dependency>-->
-            <dependency>
+<!--            <dependency>-->
-                <groupId>com.couplet</groupId>
+<!--                <groupId>com.couplet</groupId>-->
-                <artifactId>couplet-electronic-fence-common</artifactId>
+<!--                <artifactId>couplet-electronic-fence-common</artifactId>-->
-                <version>${couplet.version}</version>
+<!--                <version>${couplet.version}</version>-->
-            </dependency>
+<!--            </dependency>-->
-            <dependency>
+<!--            <dependency>-->
-                <groupId>com.couplet</groupId>
+<!--                <groupId>com.couplet</groupId>-->
-                <artifactId>couplet-electronic-fence-remote</artifactId>
+<!--                <artifactId>couplet-electronic-fence-remote</artifactId>-->
-                <version>${couplet.version}</version>
+<!--                <version>${couplet.version}</version>-->
-            </dependency>
+<!--            </dependency>-->
 
-            <!-- 企业服务 模块 公共依赖 -->
+<!--            &lt;!&ndash; 企业服务 模块 公共依赖 &ndash;&gt;-->
-            <dependency>
+<!--            <dependency>-->
-                <groupId>com.couplet</groupId>
+<!--                <groupId>com.couplet</groupId>-->
-                <artifactId>couplet-enterprisemanagement-common</artifactId>
+<!--                <artifactId>couplet-enterprisemanagement-common</artifactId>-->
-                <version>${couplet.version}</version>
+<!--                <version>${couplet.version}</version>-->
-            </dependency>
+<!--            </dependency>-->
 
-            <!-- 企业服务 模块 远程调用依赖 -->
+<!--            &lt;!&ndash; 企业服务 模块 远程调用依赖 &ndash;&gt;-->
-            <dependency>
+<!--            <dependency>-->
-                <groupId>com.couplet</groupId>
+<!--                <groupId>com.couplet</groupId>-->
-                <artifactId>couplet-enterprisemanagement-remote</artifactId>
+<!--                <artifactId>couplet-enterprisemanagement-remote</artifactId>-->
-                <version>${couplet.version}</version>
+<!--                <version>${couplet.version}</version>-->
-            </dependency>
+<!--            </dependency>-->
 
-            <!-- 车辆管理模块 -->
+<!--            &lt;!&ndash; 车辆管理模块 &ndash;&gt;-->
-            <dependency>
+<!--            <dependency>-->
-                <groupId>com.couplet</groupId>
+<!--                <groupId>com.couplet</groupId>-->
-                <artifactId>couplet-modules-vehicle</artifactId>
+<!--                <artifactId>couplet-modules-vehicle</artifactId>-->
-                <version>${couplet.version}</version>
+<!--                <version>${couplet.version}</version>-->
-            </dependency>
+<!--            </dependency>-->
 
             <!-- RabbitMq模块 -->
             <dependency>
@@ -275,6 +275,13 @@
                 <version>${couplet.version}</version>
             </dependency>
 
+            <!--车辆解析模块-->
+            <dependency>
+                <groupId>com.couplet</groupId>
+                <artifactId>couplet-analyze-msg</artifactId>
+                <version>${couplet.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>