Merge branch 'dev_2.5_scan' into dev_2.5_mutiscan

# Conflicts:
#	src/main/java/com/glxp/api/task/SyncHeartService.java

src/main/java/com/glxp/api/config/TaskPoolConfig.java

@@ -1,5 +1,6 @@
 package com.glxp.api.config;
 
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -11,30 +12,65 @@ import java.util.concurrent.ThreadPoolExecutor;
 /**
  * 配置线程池
  */
-@Configuration
 @EnableAsync
+@Configuration
+@EnableConfigurationProperties(ThreadPoolConfigProperties.class)
 public class TaskPoolConfig {
 
+//    @Bean(name = "taskExecutor")
+//    @Primary
+//    public ThreadPoolTaskExecutor taskExecutor() {
+//        // 获取当前主机的cpu核心数
+//        int threadCount = Runtime.getRuntime().availableProcessors();
+//        ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+//        //核心池的大小
+//        taskExecutor.setCorePoolSize(threadCount);
+//        //线程池最大线程数
+//        taskExecutor.setMaxPoolSize(threadCount * 2);
+//        //队列最大长度
+//        taskExecutor.setQueueCapacity(200);
+//        //线程空闲时间
+//        taskExecutor.setKeepAliveSeconds(60);
+//        //配置线程前缀
+//        taskExecutor.setThreadNamePrefix("custom_executor");
+//        //配置拒绝策略
+//        taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+//        //执行初始化
+//        taskExecutor.initialize();
+//        return taskExecutor;
+//    }
+
     @Bean(name = "taskExecutor")
     @Primary
-    public ThreadPoolTaskExecutor taskExecutor() {
-        // 获取当前主机的cpu核心数
-        int threadCount = Runtime.getRuntime().availableProcessors();
+    public ThreadPoolTaskExecutor taskExecutor(ThreadPoolConfigProperties properties) {
+        // 动态获取CPU核心数
+        final int cpuCores = Runtime.getRuntime().availableProcessors();
+
         ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
-        //核心池的大小
-        taskExecutor.setCorePoolSize(threadCount);
-        //线程池最大线程数
-        taskExecutor.setMaxPoolSize(threadCount * 2);
-        //队列最大长度
-        taskExecutor.setQueueCapacity(200);
-        //线程空闲时间
-        taskExecutor.setKeepAliveSeconds(60);
-        //配置线程前缀
-        taskExecutor.setThreadNamePrefix("custom_executor");
-        //配置拒绝策略
-        taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        //执行初始化
+        // 核心线程数（配置优先，默认CPU核心数）
+        taskExecutor.setCorePoolSize(
+                properties.getCorePoolSize() != null ?
+                        properties.getCorePoolSize() : cpuCores
+        );
+
+        // 最大线程数（配置优先，默认CPU核心数*2）
+        taskExecutor.setMaxPoolSize(
+                properties.getMaxPoolSize() != null ?
+                        properties.getMaxPoolSize() : cpuCores * 2
+        );
+
+        // 其他固定配置项
+        taskExecutor.setQueueCapacity(properties.getQueueCapacity());
+        taskExecutor.setKeepAliveSeconds(properties.getKeepAliveSeconds());
+        taskExecutor.setThreadNamePrefix(properties.getThreadNamePrefix());
+
+        // 拒绝策略保持原样
+        taskExecutor.setRejectedExecutionHandler(
+                new ThreadPoolExecutor.CallerRunsPolicy()
+        );
+
         taskExecutor.initialize();
         return taskExecutor;
     }
+
 }

src/main/java/com/glxp/api/config/ThreadPoolConfigProperties.java

@@ -0,0 +1,36 @@
+package com.glxp.api.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+// 1. 创建配置类（建议放在config包下）
+@ConfigurationProperties(prefix = "thread.pool")
+@Data
+public class ThreadPoolConfigProperties {
+    /**
+     * 核心线程数（默认CPU核心数）
+     */
+    private Integer corePoolSize;
+
+    /**
+     * 最大线程数（默认CPU核心数*2）
+     */
+    private Integer maxPoolSize;
+
+    /**
+     * 队列容量（默认200）
+     */
+    private int queueCapacity = 200;
+
+    /**
+     * 线程空闲时间（秒，默认60）
+     */
+    private int keepAliveSeconds = 60;
+
+    /**
+     * 线程名前缀（默认"custom_executor_"）
+     */
+    private String threadNamePrefix = "custom_executor_";
+
+
+}

src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java

@@ -149,17 +149,14 @@ public class RelCodeDetailService extends ServiceImpl<RelCodeDetailMapper, RelCo
      * @return
      */
     public List<RelCodeDetail> getAllNext(String code) {
-        RelCodeDetail relCodeDetail = this.baseMapper.selectOne(
-                new LambdaQueryWrapper<RelCodeDetail>().eq(RelCodeDetail::getCurCode, code)
-        );
-        if(Objects.isNull(relCodeDetail)){
-            relCodeDetail = new RelCodeDetail();
-            relCodeDetail.setCurCode(code);
-        }
         List<RelCodeDetail> list = new ArrayList<>();
-        list.add(relCodeDetail);
         fetchAllChildren(code, list);
+        if (CollUtil.isEmpty(list)) {
+            RelCodeDetail relCodeDetail = new RelCodeDetail();
+            relCodeDetail.setCurCode(code);
+            list.add(relCodeDetail);
 
+        }
         return list;
     }
 

src/main/java/com/glxp/api/service/sync/WebSocketComponent.java

@@ -65,7 +65,7 @@ public class WebSocketComponent implements CommandLineRunner {
                         }
                     }
                     if (message.equals(SocketMsgType.DL_ALL_DATA)) {
-                        heartTaskService.pullData();
+                        heartTaskService.pullData(null);
                     }
                     if (message.contains(SocketMsgType.STAT_DATA)) {
                         cn.hutool.json.JSONObject obj = JSONUtil.parseObj(message);

src/main/java/com/glxp/api/task/SyncHeartService.java

@@ -25,17 +25,20 @@ public class SyncHeartService {
     private SyncDataSetDao syncDataSetDao;
 
     public void syncProcess() {
-        //查询数据同步设置
-        pushData();
-        pushOrder();
-//        pullData();
-    }
 
-    public void pushData() {
         SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
         if (!syncDataSetEntity.isDownstreamEnable()) {
             return;
         }
+
+        //查询数据同步设置
+        pushData(syncDataSetEntity);
+        pushOrder(syncDataSetEntity);
+        pullData(syncDataSetEntity);
+    }
+
+    public void pushData(SyncDataSetEntity syncDataSetEntity) {
+
         //定时上传最近更新基础数据至上游轮询时间
         long timeInterval1 = syncDataSetEntity.getSyncTime() * 6 * 1000L;
         long curTime1 = System.currentTimeMillis();
@@ -100,7 +103,24 @@ public class SyncHeartService {
         }
     }
 
-    public void pullData() {
+    public void pullData(SyncDataSetEntity syncDataSetEntity) {
+
+        if (syncDataSetEntity == null) {
+            syncDataSetEntity = syncDataSetDao.selectSet();
+            if (!syncDataSetEntity.isDownstreamEnable()) {
+                return;
+            }
+        }
+
+        //定时下载上游最近更新数据轮询时间
+        long timeInterval = syncDataSetEntity.getSyncDownloadTime() * 6 * 100;
+        long curTime = System.currentTimeMillis();
+        Long lastTime = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_DATA");
+        if (lastTime == null) {
+            lastTime = System.currentTimeMillis();
+            redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", lastTime);
+        }
+        if (curTime - lastTime > timeInterval) {
             try {
                 heartService.dlAllOrder();
             } catch (Exception e) {
@@ -119,5 +139,8 @@ public class SyncHeartService {
             redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", System.currentTimeMillis());
         }
 
+
+    }
+
 }
 

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -50,26 +50,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
 
 
     private void process() {
-        log.info("数据同步心跳--");
         syncHeartService.syncProcess();
-
-        SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
-        if (!syncDataSetEntity.isDownstreamEnable()) {
-            return;
-        }
-        //定时下载上游最近更新数据轮询时间
-        long timeInterval = syncDataSetEntity.getSyncDownloadTime() * 6 * 100;
-        long curTime = System.currentTimeMillis();
-        Long lastTime = (Long) redisUtil.get("SPS_SYNC_DOWNLOAD_DATA");
-        if (lastTime == null) {
-            lastTime = System.currentTimeMillis();
-            redisUtil.set("SPS_SYNC_DOWNLOAD_DATA", lastTime);
-        }
-        if (curTime - lastTime > timeInterval) {
-            syncHeartService.pullData();
-        }
-
-
     }
 
 

src/main/resources/application.yml

@@ -41,3 +41,13 @@ WEB_SUB_TITLE: 医院UDI管理系统
 WEB_VERSION:
 WEB_LOGO:
 #http://127.0.0.1:9991/udiwms/image/getImage?type=image1&name=dima.jpg
+
+
+# 生产环境推荐配置（8核CPU示例）
+thread:
+  pool:
+    core-pool-size: 8      # 与CPU核心一致
+    max-pool-size: 16      # 核心数*2
+    queue-capacity: 1000   # 根据业务负载调整
+    keep-alive-seconds: 160 # 大流量场景适当延长
+