lyq hace 1 año
padre
commit
8d8bb89d7c

+ 19 - 21
src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/CentereventTEventcatalogueController.java

@@ -80,8 +80,6 @@ public class CentereventTEventcatalogueController extends BaseController {
     @Qualifier("asyncTaskExecutor")
     private ThreadPoolTaskExecutor asyncTaskExecutor;
 
-
-
     /**
      * 查询事件目录列表
      */
@@ -298,8 +296,8 @@ public class CentereventTEventcatalogueController extends BaseController {
                     paramMap.put("busId", log.getId());
                     paramMap.put("token", RemoteApiUtil.getInstance().getToken());// 大华token
                     remoteDataService.updateAttach(paramMap);
-                },asyncTaskExecutor);
-               // future.get();
+                }, asyncTaskExecutor);
+                // future.get();
             }
         } catch (Exception e) {
             logger.error(e.getMessage());
@@ -327,23 +325,6 @@ public class CentereventTEventcatalogueController extends BaseController {
         EventProducerUtil.publish(eventCode, BusinessType.DELETE);
         return toAjax(result);
     }
-    @GetMapping("/upatach/{num}")
-    public AjaxResult upatach(@PathVariable int num)throws Exception {
-        Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
-        paramMap.put("token", RemoteApiUtil.getInstance().getToken());// 大华token
-        List<Map<String, Object>> list = centereventTEventcatalogueService.selectFailUpattah(num);
-        int i = 0;
-        for (Map map:list) {
-            paramMap.put("czlx", "AI");
-            paramMap.put("busId", MapUtils.getString(map,"busId"));
-            remoteDataService.updateAttach(paramMap);
-            Thread.sleep(60000);
-            i++;
-            logger.info("==================>大华图片远程下载过程中"+MapUtils.getString(map,"busId")+"当前序号"+i);
-        }
-        return AjaxResult.success();
-    }
-
 
     /**
      * 手机端调用发送短信
@@ -401,4 +382,21 @@ public class CentereventTEventcatalogueController extends BaseController {
             return AjaxResult.success(centereventTEventcatalogueService.eventhandleDownload(id));
         }
     }
+
+    @GetMapping("/upatach/{num}")
+    public AjaxResult upatach(@PathVariable int num) throws Exception {
+        Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
+        paramMap.put("token", RemoteApiUtil.getInstance().getToken());// 大华token
+        List<Map<String, Object>> list = centereventTEventcatalogueService.selectFailUpattah(num);
+        int i = 0;
+        for (Map map : list) {
+            paramMap.put("czlx", "AI");
+            paramMap.put("busId", MapUtils.getString(map, "busId"));
+            remoteDataService.updateAttach(paramMap);
+            Thread.sleep(60000);
+            i++;
+            logger.info("==================>大华图片远程下载过程中" + MapUtils.getString(map, "busId") + "当前序号" + i);
+        }
+        return AjaxResult.success(i);
+    }
 }

+ 9 - 9
src/main/java/com/sooka/sponest/event/config/asyncTaskExecutorConfig.java

@@ -7,19 +7,21 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
 
 @Configuration
-public class asyncTaskExecutorConfig {
-    //阻塞队列
+public class AsyncTaskExecutorConfig {
+
+    // 阻塞队列
     private static final int workQueue = 20;
-    //线程空闲后的存活时长
+    // 线程空闲后的存活时长
     private static final int keepAliveTime = 30;
-    //Cpu核数
+    // Cpu核数
     private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
-    //核心线程数量大小
+    // 核心线程数量大小
     private static final int corePoolSize = Math.max(2, Math.min(CPU_COUNT - 1, 4));
-    //线程池最大容纳线程数
+    // 线程池最大容纳线程数
     private static final int maxPoolSize = CPU_COUNT * 2 + 1;
+
     @Bean("asyncTaskExecutor")
-    public ThreadPoolTaskExecutor  asyncTaskExecutor() {
+    public ThreadPoolTaskExecutor asyncTaskExecutor() {
         ThreadPoolTaskExecutor threadPoolTaskExecutor = new ThreadPoolTaskExecutor();
         threadPoolTaskExecutor.setThreadNamePrefix("asyncTaskExecutor-");//线程前缀
         threadPoolTaskExecutor.setCorePoolSize(corePoolSize);//核心线程数
@@ -30,6 +32,4 @@ public class asyncTaskExecutorConfig {
         threadPoolTaskExecutor.initialize();
         return threadPoolTaskExecutor;
     }
-
 }
-