调整代码

src/main/java/com/ebei/screen/common/task/ScreenTask.java

@@ -53,7 +53,7 @@ public class ScreenTask {
         try {
             log.info("开始处理数据 开始时间：{}", DateUtil.now());
             // 获取10条进行处理
-            boolean result = parkSystemService.taskExec(10);
+            boolean result = parkSystemService.taskExec(5);
             log.info("数据处理结束 结束时间：{} 处理结果：{}", DateUtil.now(), result);
         } catch (Exception e) {
             log.info("定时任务执行出现错误：{}", e);

src/main/java/com/ebei/screen/common/util/MyRunner.java

@@ -26,7 +26,7 @@ public class MyRunner implements ApplicationRunner {
 
     @Override
     public void run(ApplicationArguments args) {
-        energyPlatformService.initData();
+        // energyPlatformService.initData();
         ebaSystemService.initData();
         ParkUtils.getLoginToken();
         log.info("=============全部初始化完毕=============");

src/main/java/com/ebei/screen/service/impl/EbaSystemServiceImpl.java

@@ -63,12 +63,12 @@ public class EbaSystemServiceImpl implements EbaSystemService {
     public void initData() {
         initToken();
         initProjectList();
-        initDeviceSystemList();
-        initDeviceTypeList();
-        initDeviceParamList();
-        initDeviceAlarmTypeList();
-        initFireDeviceTypeList();
-        initThreeBrothers();
+//        initDeviceSystemList();
+//        initDeviceTypeList();
+//        initDeviceParamList();
+//        initDeviceAlarmTypeList();
+//        initFireDeviceTypeList();
+//        initThreeBrothers();
         log.info("EBA数据全部初始化完毕");
     }
 

src/main/java/com/ebei/screen/service/impl/ParkSystemServiceImpl.java

@@ -100,33 +100,38 @@ public class ParkSystemServiceImpl implements ParkSystemService {
             List<String> ids = (List<String>) (List) data.subList(0, Integer.min(data.size(), size));
             CountDownLatch countDownLatch = new CountDownLatch(Integer.min(data.size(), size));
             ids.forEach(x -> RunnableUtils.start(() -> {
-                JSONObject xx = mongoTemplate.findById(x, JSONObject.class, "parkQueue");
-                if (xx == null) {
+                JSONObject params = null;
+                try {
+                    JSONObject xx = mongoTemplate.findById(x, JSONObject.class, "parkQueue");
+                    if (xx == null) {
+                        return;
+                    }
+                    Instant start = Instant.now();
+                    params = xx.getJSONObject("data");
+                    if (x.startsWith("parkInfo")) {
+                        this.parkInfo(params);
+                    } else if (x.startsWith("parkSpace")) {
+                        this.parkSpace(params);
+                    } else if (x.startsWith("parkIn")) {
+                        this.parkIn(params);
+                    } else if (x.startsWith("parkOut")) {
+                        this.parkOut(params);
+                    } else if (x.startsWith("parkOrder")) {
+                        this.parkOrder(params);
+                    } else if (x.startsWith("parkCharge")) {
+                        this.parkCharge(params);
+                    } else if (x.startsWith("parkServiceInfo")) {
+                        this.parkServiceInfo(params);
+                    }
+                    // 处理完成删除当前document
+                    mongoTemplate.remove(xx, "parkQueue");
+                    Instant end = Instant.now();
+                    log.info("当前执行：" + x + " 执行时间：" + Duration.between(start, end).toMillis() + "毫秒 当前可用线程数：" + RunnableUtils.getActiveNum());
+                } catch (Exception e) {
+                    log.info("执行队列出现异常:{} 参数:{}", e, params);
+                } finally {
                     countDownLatch.countDown();
-                    return;
                 }
-                Instant start = Instant.now();
-                JSONObject params = xx.getJSONObject("data");
-                if (x.startsWith("parkInfo")) {
-                    this.parkInfo(params);
-                } else if (x.startsWith("parkSpace")) {
-                    this.parkSpace(params);
-                } else if (x.startsWith("parkIn")) {
-                    this.parkIn(params);
-                } else if (x.startsWith("parkOut")) {
-                    this.parkOut(params);
-                } else if (x.startsWith("parkOrder")) {
-                    this.parkOrder(params);
-                } else if (x.startsWith("parkCharge")) {
-                    this.parkCharge(params);
-                } else if (x.startsWith("parkServiceInfo")) {
-                    this.parkServiceInfo(params);
-                }
-                // 处理完成删除当前document
-                mongoTemplate.remove(xx, "parkQueue");
-                countDownLatch.countDown();
-                Instant end = Instant.now();
-                log.info("当前执行：" + x + " 执行时间：" + Duration.between(start, end).toMillis() + "毫秒 当前可用线程数：" + RunnableUtils.getActiveNum());
             }));
             countDownLatch.await();
             // 删除本批次处理的id

src/main/resources/application.yml

@@ -6,7 +6,7 @@ spring:
     default-property-inclusion: non_null
     time-zone: Asia/Shanghai
   profiles:
-    active: dev
+    active: uat
 cn:
   auth:
     permit-url-list: