Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java

@@ -64,6 +64,8 @@ public class AbilityCenterControllerV3 {
 
     private static final ExecutorService executor = Executors.newWorkStealingPool(CPUNUM * 2);
 
+    private static final ExecutorService executorMain = Executors.newCachedThreadPool();
+
     private static final ObjectMapper oMapper = new ObjectMapper();
 
     @Value("${project.place}")
@@ -129,8 +131,10 @@ public class AbilityCenterControllerV3 {
         final Optional<SysDeptDTO> deptDTO = Optional.ofNullable(sysDeptService.getByName(bigDateDeptName));
         final UserDetail user = SecurityUser.getUser();
         switch (Constant.ProjectPlace.getByFlag(projectPlace)) {
-            case TSINGTAO: { // 青岛市局 异步会死锁
-                deal(abilityBatchApplicationDTO, deptDTO, applyFlag, user);
+            case TSINGTAO: { // 青岛市局 异步会死锁 使用缓存线程池
+                executorMain.execute(() -> {
+                    deal(abilityBatchApplicationDTO, deptDTO, applyFlag, user);
+                });
             }
             break;
             default: {
@@ -165,7 +169,9 @@ public class AbilityCenterControllerV3 {
         final UserDetail user = SecurityUser.getUser();
         switch (Constant.ProjectPlace.getByFlag(projectPlace)) {
             case TSINGTAO: { // 青岛市局 异步会死锁
-                deal(abilityBatchApplicationDTO, deptDTO, applyFlag, user);
+                executorMain.execute(() -> {
+                    deal(abilityBatchApplicationDTO, deptDTO, applyFlag, user);
+                });
             }
             break;
             default: {
@@ -187,7 +193,8 @@ public class AbilityCenterControllerV3 {
     // TODO 拆单进行审核 abilityprocess_v3
     private void deal(TAbilityBatchApplicationDTO abilityBatchApplicationDTO, Optional<SysDeptDTO> deptDTO, String applyFlag, UserDetail user) {
         SysUserDTO sysUserDTO = sysUserService.get(user.getId());
-        List<String> resourceName = abilityBatchApplicationDTO.getSystem().stream().filter(index -> tAbilityApplicationService.countUserResourceApply(SecurityUser.getUserId(), Long.valueOf(index.get("resourceId"))) > 0)
+        List<String> resourceName = abilityBatchApplicationDTO.getSystem().stream()
+                .filter(index -> tAbilityApplicationService.countUserResourceApply(SecurityUser.getUserId(), Long.valueOf(index.get("resourceId"))) > 0)
                 .map(index -> index.get("resourceName"))
                 .collect(Collectors.toList()); // 获取已申请的资源名称
         if (!resourceName.isEmpty()) {