From b5267c24f42b9db4dc129cd7df24ee2d6816f45c Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Thu, 28 Nov 2024 16:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/access/runner/AccessApplicationRunner.java | 5 ++---
 .../java/com/njcn/stat/service/impl/StatServiceImpl.java     | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
index e674aa0..4ddd8ff 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
@@ -39,7 +39,6 @@ public class AccessApplicationRunner implements ApplicationRunner {
     private final DictTreeFeignClient dictTreeFeignClient;
 
     ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-    ExecutorService executor = Executors.newFixedThreadPool(10);
     private static final long ACCESS_TIME = 60L;
 
     @Override
@@ -49,6 +48,7 @@ public class AccessApplicationRunner implements ApplicationRunner {
             log.info("系统重启,所有符合条件的装置全部接入!");
             List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getOnlineDev();
             if (CollUtil.isNotEmpty(list)) {
+                ExecutorService executor = Executors.newFixedThreadPool(10);
                 // 将任务平均分配给10个子列表
                 List<List<CsEquipmentDeliveryPO>> subLists = new ArrayList<>();
                 int partitionSize = list.size() / 10;
@@ -57,7 +57,6 @@ public class AccessApplicationRunner implements ApplicationRunner {
                     int end = (i == 9) ? list.size() : start + partitionSize;
                     subLists.add(list.subList(start, end));
                 }
-
                 // 创建一个ExecutorService来处理这些任务
                 List<Future<Void>> futures = new ArrayList<>();
                 // 提交任务给线程池执行
@@ -81,10 +80,10 @@ public class AccessApplicationRunner implements ApplicationRunner {
                 }
                 // 关闭ExecutorService
                 executor.shutdown();
-                scheduler.shutdown();
             }
         };
         scheduler.schedule(task,ACCESS_TIME,TimeUnit.SECONDS);
+        scheduler.shutdown();
     }
 
     public void accessDev(List<CsEquipmentDeliveryPO> list) {
diff --git a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java
index c1d8393..966db25 100644
--- a/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java
+++ b/iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java
@@ -65,6 +65,7 @@ public class StatServiceImpl implements IStatService {
         dataArrayParam.setId(appAutoDataMessage.getId());
         dataArrayParam.setDid(appAutoDataMessage.getDid());
         dataArrayParam.setCldId(appAutoDataMessage.getMsg().getClDid());
+        dataArrayParam.setIdx(appAutoDataMessage.getMsg().getDsNameIdx());
         List<AppAutoDataMessage.DataArray> list = appAutoDataMessage.getMsg().getDataArray();
         //获取监测点id
         String lineId = null;
@@ -113,7 +114,7 @@ public class StatServiceImpl implements IStatService {
                     default:
                         break;
                 }
-                String key = AppRedisKey.DEV_MODEL.concat(dataArrayParam.getId() + dataArrayParam.getDid() + dataArrayParam.getCldId() + dataArrayParam.getStatMethod());
+                String key = AppRedisKey.DEV_MODEL.concat(dataArrayParam.getId() + dataArrayParam.getDid() + dataArrayParam.getCldId() + dataArrayParam.getStatMethod() + dataArrayParam.getIdx());
                 Object object = redisUtil.getObjectByKey(key);
                 List<CsDataArray> dataArrayList;
                 if (Objects.isNull(object)){