1

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

@@ -1,2 +1,2 @@
 com.couplet.remote.factory.RemoteVehicleFallbackFactory
-com.couplet.remote.factory.RemoteVehicleFallbackFactory
+com.couplet.remote.factory.RemoteTroubleFallbackFactory

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

@@ -15,10 +15,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableCustomConfig
 @EnableCustomSwagger2
 @EnableMyFeignClients(basePackages = ("com.couplet"))
-@SpringBootApplication(scanBasePackages = {"com.couplet"})
+@SpringBootApplication(scanBasePackages = {"com.couplet", "com.couplet.mq.remote","com.couplet.business.server.time"})
 @EnableScheduling
 public class CoupletBusinessApplication {
-    public static void main (String[] args) {
+    public static void main(String[] args) {
         SpringApplication.run(CoupletBusinessApplication.class, args);
     }
 

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

@@ -3,7 +3,6 @@ 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.data.redis.core.StringRedisTemplate;
@@ -30,31 +29,38 @@ public class Timer {
 
 
     //判断车辆是否下线
-    @Scheduled(cron = "* * * * * *")
-    public void outLine() {
+    @Scheduled(cron = "0/1 * * * * *")
+    public void downLine() {
         log.info("定时器启动");
 
         //先查询车辆列表
         List<Vehicle> list = vehicleService.list(new VehicleListParams(null, null, null, null));
-        for (Vehicle vehicle : list) {
-            //只针对已经上线的车辆
-            if (redis.hasKey(vehicle.getVin())) {
 
-                //如果vin的缓存 时间还剩一秒，则判断为已经下线
-                if (redis.getExpire(vehicle.getVin()) <= 3) {
-                    log.info(vehicle.getVin() + "的车辆已经下线");
 
-                    //执行修改下线状态的方法
-                    Integer i = vehicleService.onOrOutLineByVIN(vehicle.getVin(), 0);
+        list.forEach(vehicle -> {
+            try {
+                //只针对已经上线的车辆
+                if (redis.hasKey(vehicle.getVin())) {
 
-//                    if (0 == 1) {
-//                        log.error("下线状态修改失败");
-//                    }
+                    //如果vin的缓存 时间还剩一秒，则判断为已经下线
+                    if (redis.getExpire(vehicle.getVin()) <= 3) {
+                        log.info(vehicle.getVin() + "的车辆已经下线");
 
-                    log.info("下线状态修改成功");
+                        //执行修改下线状态的方法
+                        Integer i = vehicleService.onOrOutLineByVIN(vehicle.getVin(), 0);
+
+                        if (0 == i) {
+                            log.error("下线状态修改失败");
+                        } else {
+                            log.info("下线状态修改成功");
+                        }
+
+                    }
                 }
+            } catch (Exception e) {
+                log.error(e.getMessage());
             }
-        }
+        });
 
     }
 

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

@@ -1 +0,0 @@
-com.couplet.business.server.time.Timer

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

@@ -16,9 +16,11 @@ 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-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java

@@ -187,7 +187,7 @@ public class MqttMonitor {
 
 
         //如果不存在这个车
-        if (0 == vehicles.size()) {
+        if (0 == vehicles.size() || null == vehicles) {
             //将不属于自己系统的车辆存入缓存，便于提前进行拒绝提示
 //                        redis.setCacheObject("不存在的车辆VIN" + start17, start17);
             log.error("未找到vin码为" + start17 + "的车辆信息");

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

@@ -36,7 +36,7 @@ mqtt:
 #    broker: mqtt://115.159.47.13:1883
     username:
     password:
-    clientId: fluxmq
+    clientId: fluxMq
     qos: 0
     topic: test