From 74e745dd046b15b51f0ae0e62ab29728ed481e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Wed, 18 Nov 2020 11:05:58 +0800 Subject: [PATCH 01/10] fix --- .../controller/AssessManagerController.java | 15 ++++++----- .../impl/AssessManagerServiceImpl.java | 25 ------------------- 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java index facbc770..ae350613 100644 --- a/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java +++ b/src/main/java/com/lz/modules/performance/controller/AssessManagerController.java @@ -51,13 +51,14 @@ public class AssessManagerController extends AbstractController{ @ApiOperation("获取考核列表") @ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerListRes.class)}) public R assessList(@RequestBody AssessListReq req){ + Long userId = null; try { - Long userId = getUserId(); + userId = getUserId(); req.setLoginUserId(userId); PageUtils pageUtils = assessManagerService.assessList(req); return R.ok().put("data",pageUtils); } catch (Exception e) { - log.error("获取考核列表异常，",e); + log.error("获取考核列表异常，userId: " + userId,e); return R.error(e.getMessage()); } } @@ -67,12 +68,13 @@ public class AssessManagerController extends AbstractController{ @ApiResponses({@ApiResponse(code = 200,message = "成功",response = AssessManagerDetailRes.class)}) public R assessDetail(@RequestBody AssessDetailReq req){ PageUtils pageUtils; + Long userId = null; try { - Long userId = getUserId(); + userId = getUserId(); req.setLoginUserId(userId); pageUtils = assessManagerService.assessDetail(req); } catch (Exception e) { - log.error("获取考核详情列表异常" ,e); + log.error("获取考核详情列表异常，userId: " + userId,e); return R.error(e.getMessage()); } return R.ok().put("data",pageUtils); @@ -86,12 +88,13 @@ public class AssessManagerController extends AbstractController{ @ApiResponses({@ApiResponse(code = 200,message = "成功",response = ChartStatistical.class)}) public R assessChart(@RequestBody AssessDetailReq req){ List process; + Long userId = null; try { - Long userId = getUserId(); + userId = getUserId(); req.setLoginUserId(userId); process = chartResultService.countAssessNumByFlowProcess(req); } catch (Exception e) { - log.error("获取详情顶部人数统计异常" ,e); + log.error("获取详情顶部人数统计异常，userId: " + userId,e); return R.error(e.getMessage()); } return R.ok().put("data",process); diff --git a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java index 72282a64..39fa2115 100644 --- a/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java +++ b/src/main/java/com/lz/modules/performance/service/impl/AssessManagerServiceImpl.java @@ -19,13 +19,11 @@ import com.lz.modules.flow.dao.EvaluationStartStaffMapper; import com.lz.modules.flow.dao.FlowRecordMapper; import com.lz.modules.flow.dao.FlowStartMapper; import com.lz.modules.flow.entity.EvaluationGroup; -import com.lz.modules.flow.entity.EvaluationStartStaff; import com.lz.modules.flow.entity.FlowStart; import com.lz.modules.flow.model.GroupStaffs; import com.lz.modules.flow.model.StartGroups; import com.lz.modules.flow.service.EvaluationGroupService; import com.lz.modules.flow.service.EvaluationStartStaffService; -import com.lz.modules.flow.service.FlowRecordService; import com.lz.modules.flow.service.FlowStartService; import com.lz.modules.job.business.DingtalkBusiness; import com.lz.modules.performance.dto.ToScoreDingTalkDto; @@ -40,21 +38,12 @@ import com.lz.modules.performance.service.AssessService; import com.lz.modules.sys.dao.app.ResultRecordMapper; import com.lz.modules.sys.entity.app.ResultRecord; import com.lz.modules.sys.service.app.ResultRecordService; -import com.sun.org.apache.regexp.internal.RE; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; @@ -291,7 +280,6 @@ public class AssessManagerServiceImpl implements AssessManagerService { Long evaluation = group.getId(); int i = evaluationStartStaffService.updateBatchToScore(req.getStartId(), group.getId()); log.info("更新evaluationStartStaff 数据 为已评分 " + i); - List dtos = resultRecordMapper.selectToScoreList(req.getStartId(), evaluation); if(CollectionUtils.isNotEmpty(dtos)){ log.info("本次评分更新操作 num: " + dtos.size()); @@ -347,17 +335,4 @@ public class AssessManagerServiceImpl implements AssessManagerService { } - /* public static void main(String[] args) { - ExecutorService executorService = Executors.newFixedThreadPool(10); - CompletableFuture> future = CompletableFuture.supplyAsync(()-> Arrays.asList(1L,2L),executorService); - try { - List longs = future.get(); - System.out.println(); - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (ExecutionException e) { - e.printStackTrace(); - } - }*/ - } \ No newline at end of file From 790d9b33f7a938d225c58ac6589d9824b190334e Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 18 Nov 2020 11:25:13 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/service/impl/FlowStartServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 182a02d8..d925e7a3 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -822,17 +822,17 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Wed, 18 Nov 2020 14:23:19 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=8E=B7=E5=8F=96=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java | 2 ++ .../modules/flow/service/FlowChartDetailRecordService.java | 3 +++ .../flow/service/impl/FlowChartDetailRecordServiceImpl.java | 5 +++++ .../lz/modules/flow/service/impl/FlowStartServiceImpl.java | 4 ++-- .../resources/mapper/flow/FlowChartDetailRecordMapper.xml | 4 ++++ src/main/resources/mapper/flow/FlowChartMapper.xml | 2 +- 6 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java b/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java index c73ccc97..646c5c30 100644 --- a/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/FlowChartDetailRecordMapper.java @@ -43,4 +43,6 @@ public interface FlowChartDetailRecordMapper extends BaseMapper updaes); List selectFlowChartDetailRecordsByFlowProcess(@Param("groupId") Long groupId, @Param("flowProcess") int flowProcess); + + List selectOpenFlowChartDetailRecordByGroupIdAndChartId(@Param("groupId") Long groupId, @Param("chartId") Long chartId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java b/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java index 7662a366..685c89d3 100644 --- a/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java +++ b/src/main/java/com/lz/modules/flow/service/FlowChartDetailRecordService.java @@ -42,4 +42,7 @@ public interface FlowChartDetailRecordService extends IService updaes); List selectFlowChartDetailRecordsByFlowProcess(Long groupId, int flowProcess); + + //获取开启节点的 + List selectOpenFlowChartDetailRecordByGroupIdAndChartId(Long groupId, Long chartId); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java index b132375d..54f230ee 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowChartDetailRecordServiceImpl.java @@ -86,6 +86,11 @@ public class FlowChartDetailRecordServiceImpl extends ServiceImpl selectOpenFlowChartDetailRecordByGroupIdAndChartId(Long groupId, Long chartId){ + return flowChartDetailRecordMapper.selectOpenFlowChartDetailRecordByGroupIdAndChartId(groupId, chartId); + } + diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index d925e7a3..deaff8e8 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -355,7 +355,7 @@ public class FlowStartServiceImpl extends ServiceImpl flowChartDetailRecords1 - = flowChartDetailRecordService.selectFlowChartDetailRecordByGroupIdAndChartId(evaluationGroup.getId(), chart.getId()); + = flowChartDetailRecordService.selectOpenFlowChartDetailRecordByGroupIdAndChartId(evaluationGroup.getId(), chart.getId()); flowChartDetailRecords.addAll(flowChartDetailRecords1); } @@ -695,7 +695,7 @@ public class FlowStartServiceImpl extends ServiceImpl + + diff --git a/src/main/resources/mapper/flow/FlowChartMapper.xml b/src/main/resources/mapper/flow/FlowChartMapper.xml index 948bfa61..9209f5c3 100644 --- a/src/main/resources/mapper/flow/FlowChartMapper.xml +++ b/src/main/resources/mapper/flow/FlowChartMapper.xml @@ -122,7 +122,7 @@ From 5b5e4caf6a4fb87db5044ff3cb0552197f9b9380 Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 18 Nov 2020 14:42:01 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AD=90=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/service/impl/FlowStartServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index deaff8e8..09a003ae 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -103,6 +103,8 @@ public class FlowStartServiceImpl extends ServiceImpl threads = new ArrayList<>(); + @@ -807,9 +809,13 @@ public class FlowStartServiceImpl extends ServiceImpl resultRecords){ - ThreadInitFlowRecord threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords); - Thread thread = new Thread(threadInitFlowRecord); - thread.start(); + if(resultRecords.size() > 0){ + ThreadInitFlowRecord threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords); + Thread thread = new Thread(threadInitFlowRecord); + thread.start(); + threads.add(thread); + } + } public class ThreadInitFlowRecord implements Runnable{ @@ -833,6 +839,7 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Wed, 18 Nov 2020 14:46:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=90=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowStartServiceImpl.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 09a003ae..58963eb8 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -194,8 +194,8 @@ public class FlowStartServiceImpl extends ServiceImpl resultRecords){ + private void initFlowRecordAnsy(List resultRecords, List noticeStaff){ if(resultRecords.size() > 0){ - ThreadInitFlowRecord threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords); + ThreadInitFlowRecord threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords, noticeStaff); Thread thread = new Thread(threadInitFlowRecord); thread.start(); threads.add(thread); @@ -820,10 +820,11 @@ public class FlowStartServiceImpl extends ServiceImpl resultRecords; + List noticeStaff; - public ThreadInitFlowRecord(List resultRecords){ + public ThreadInitFlowRecord(List resultRecords, List noticeStaff){ this.resultRecords = resultRecords; - + this.noticeStaff = noticeStaff; } @Override @@ -839,6 +840,7 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Wed, 18 Nov 2020 14:50:21 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AD=90=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/flow/service/impl/FlowStartServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 58963eb8..3dd30d01 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -829,9 +829,9 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Wed, 18 Nov 2020 14:58:05 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=AD=90=E7=BA=BF=E7=A8=8B=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/flow/service/impl/FlowStartServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index 3dd30d01..a860c972 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -103,7 +103,8 @@ public class FlowStartServiceImpl extends ServiceImpl threads = new ArrayList<>(); + ThreadInitFlowRecord threadInitFlowRecord;// = new ThreadInitFlowRecord(resultRecords, noticeStaff); + Thread thread; @@ -810,10 +811,9 @@ public class FlowStartServiceImpl extends ServiceImpl resultRecords, List noticeStaff){ if(resultRecords.size() > 0){ - ThreadInitFlowRecord threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords, noticeStaff); - Thread thread = new Thread(threadInitFlowRecord); + threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords, noticeStaff); + thread = new Thread(threadInitFlowRecord); thread.start(); - threads.add(thread); } } From 5b9376d3b7c4d4f02307a0361f3fdd925cf926db Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 18 Nov 2020 15:01:05 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=AD=90=E7=BA=BF=E7=A8=8B=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flow/service/impl/FlowStartServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index a860c972..d9917be0 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -103,8 +103,7 @@ public class FlowStartServiceImpl extends ServiceImpl threads = new ArrayList<>(); @@ -811,9 +810,10 @@ public class FlowStartServiceImpl extends ServiceImpl resultRecords, List noticeStaff){ if(resultRecords.size() > 0){ - threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords, noticeStaff); - thread = new Thread(threadInitFlowRecord); + ThreadInitFlowRecord threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords, noticeStaff); + Thread thread = new Thread(threadInitFlowRecord); thread.start(); + threads.add(threadInitFlowRecord); } } @@ -841,7 +841,7 @@ public class FlowStartServiceImpl extends ServiceImpl Date: Wed, 18 Nov 2020 15:05:34 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=AD=90=E7=BA=BF=E7=A8=8B=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/flow/service/impl/FlowStartServiceImpl.java | 7 ++++--- .../java/com/lz/modules/job/business/DingtalkBusiness.java | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java index d9917be0..76f67d31 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java @@ -103,7 +103,7 @@ public class FlowStartServiceImpl extends ServiceImpl threads = new ArrayList<>(); + List threadInitFlowRecords = new ArrayList<>(); @@ -811,9 +811,10 @@ public class FlowStartServiceImpl extends ServiceImpl resultRecords, List noticeStaff){ if(resultRecords.size() > 0){ ThreadInitFlowRecord threadInitFlowRecord = new ThreadInitFlowRecord(resultRecords, noticeStaff); + threadInitFlowRecords.add(threadInitFlowRecord);//防止提前回收 Thread thread = new Thread(threadInitFlowRecord); thread.start(); - threads.add(threadInitFlowRecord); + } } @@ -841,7 +842,7 @@ public class FlowStartServiceImpl extends ServiceImpl threadSendMessages = new ArrayList<>(); + @Value("${dingtalk.appid}") private String appid; @@ -257,8 +259,10 @@ public class DingtalkBusiness { WorkMsgTypeEnum workMsgTypeEnum = WorkMsgTypeEnum.findRoleTypeByCode(type); ThreadSendMessage threadSendMessage = new ThreadSendMessage(fromStaff, toStaffids, workMsgTypeEnum, appid); + threadSendMessages.add(threadSendMessage);//防止提前回收 Thread thread = new Thread(threadSendMessage); thread.start(); + return "OK"; } return "error"; @@ -391,6 +395,7 @@ public class DingtalkBusiness { logger.info("ThreadSendMessage token无效"); ; } } + threadSendMessages.remove(this); } } } From fcb05afae99877fa19cf6e5d08b4e7a68b31d4df Mon Sep 17 00:00:00 2001 From: wulin Date: Wed, 18 Nov 2020 15:31:45 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/app/ResultRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/app/ResultRecordMapper.xml b/src/main/resources/mapper/app/ResultRecordMapper.xml index 04fd795b..21cb7569 100644 --- a/src/main/resources/mapper/app/ResultRecordMapper.xml +++ b/src/main/resources/mapper/app/ResultRecordMapper.xml @@ -588,7 +588,7 @@