From 9e7d3eacfd264e9ae7540c914724333ef6b5398c Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Mon, 30 Oct 2023 17:14:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=8F=B7=E6=B2=A1=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/sys/manage/CpuManage.java | 20 ++++++++++++++++++++ .../pmapi/todocenter/manage/TodoCenterManage.java | 9 +++++++++ 2 files changed, 29 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/CpuManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/CpuManage.java index f4d46ae..778c300 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/CpuManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/CpuManage.java @@ -3,6 +3,11 @@ package com.ningdatech.pmapi.sys.manage; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + /** * @Classname CpuManage * @Description @@ -17,6 +22,21 @@ public class CpuManage { private int[][] matrix = new int[1][1]; + private static ExecutorService executorService = null; + + private static Integer THREAD_MAX = 10; + + private static Integer THREAD_IDLE = 20; + + private static Integer THREAD_CAPACITY = 30; + +// static { +// executorService = new ThreadPoolExecutor(THREAD_MAX,THREAD_MAX, +// THREAD_IDLE, TimeUnit.SECONDS, +// new LinkedBlockingDeque<>(THREAD_CAPACITY), +// null,null); +// } + public void open(int i){ Double pow = Math.pow(10, i); matrix = new int[pow.intValue()][pow.intValue()]; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index b55df4a..e2a23b3 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -808,6 +808,10 @@ public class TodoCenterManage { // 获取登录用户浙政钉code String employeeCode = userFullInfo.getEmployeeCode(); + if(StringUtils.isBlank(employeeCode)){ + return PageVo.empty(); + } + // 查出项目库项目 ProjectListReq projectListReq = new ProjectListReq(); BeanUtils.copyProperties(param, projectListReq); @@ -888,6 +892,11 @@ public class TodoCenterManage { List userSubmittedList = Lists.newArrayList(); Map projectInfoMap = Maps.newHashMap(); + + if(StringUtils.isBlank(employeeCode)){ + projects = Collections.emptyList(); + } + if (CollUtil.isNotEmpty(projects)) { Map projectsMap = projects.stream().collect(Collectors.toMap(Project::getId, v -> v)); // 再查出项目关联的流程实例ID