From 419104df560d427e9cfb610bb6549dcfe695822d Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 02 四月 2025 09:11:12 +0800
Subject: [PATCH] 类名统一，查询启用赋码规则代码提到service
---
business/src/main/java/com/ycl/task/CodingTask.java | 84 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/business/src/main/java/com/ycl/task/CodingTask.java b/business/src/main/java/com/ycl/task/CodingTask.java
index 69e97cc..2dd19dd 100644
--- a/business/src/main/java/com/ycl/task/CodingTask.java
+++ b/business/src/main/java/com/ycl/task/CodingTask.java
@@ -2,21 +2,19 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
-import com.ycl.common.enums.business.CodingRulerCodeTypeEnum;
+import com.ycl.common.base.Result;
import com.ycl.common.enums.business.CodingRulerIntervalTypeEnum;
-import com.ycl.common.enums.business.CodingRulerSymbolTypeEnum;
import com.ycl.common.enums.business.ProjectProcessTypeEnum;
import com.ycl.domain.entity.*;
import com.ycl.domain.vo.CodingRulerVO;
import com.ycl.domain.vo.ProcessCodingVO;
-import com.ycl.domain.vo.ProjectCodingStatusVO;
-import com.ycl.domain.vo.ProjectProcessVO;
+import com.ycl.domain.vo.ProcessOvertimeTimesVO;
import com.ycl.factory.FlowServiceFactory;
import com.ycl.mapper.*;
-import com.ycl.service.ProjectCodingStatusService;
-import liquibase.pro.packaged.A;
+import com.ycl.service.CodingRulerService;
+import com.ycl.service.ProjectOvertimeTimesService;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -28,49 +26,41 @@
import java.util.stream.Collectors;
@Slf4j
+@RequiredArgsConstructor
@Component("codingTask")
public class CodingTask extends FlowServiceFactory {
- @Autowired
- private ProjectCodingStatusMapper projectCodingStatusMapper;
- @Autowired
- private ProjectCodingStatusService projectCodingStatusService;
+ private final ProjectOvertimeTimesMapper projectOvertimeTimesMapper;
- @Autowired
- private ProjectProcessMapper projectProcessMapper;
- @Autowired
- private ProjectInfoMapper projectInfoMapper;
- @Autowired
- private CodingRulerMapper codingRulerMapper;
+ private final ProjectOvertimeTimesService projectOvertimeTimesService;
- @Autowired
- private ProcessCodingMapper processCodingMapper;
+ private final ProjectProcessMapper projectProcessMapper;
+ private final ProjectInfoMapper projectInfoMapper;
+ private final CodingRulerService codingRulerService;
+
+ private final ProcessCodingMapper processCodingMapper;
+
+ //璁℃暟椤圭洰瓒呮椂浠诲姟鏁板苟鏇村叿璧嬬爜瑙勫垯杩涜璧嬬爜
public void codingTask(){
log.info("寮�濮嬭绠楅」鐩苟涓旇祴鐮�");
//鑾峰緱鍚敤鐨勮祴鐮佽鍒�
- List<CodingRulerVO> codingRulerVOS = codingRulerMapper.getStartRuler();
+ Result result = codingRulerService.getStartRuler();
+ CodingRulerVO yellowRuler = (CodingRulerVO) result.get("yellowRuler");
+ CodingRulerVO redRuler = (CodingRulerVO) result.get("redRuler");
+
//娌″惎鐢ㄧ洿鎺ョ粨鏉�
- if (CollectionUtils.isEmpty(codingRulerVOS)){
- log.info("鏈惎鐢ㄨ祴鐮佽鍒�");
+ if (Objects.isNull(yellowRuler) && Objects.isNull(redRuler)) {
+ log.error("鏈惎鐢ㄨ祴鐮佽鍒�");
return;
- }
- CodingRulerVO yellowRuler = null;
- CodingRulerVO redRuler = null;
- for (CodingRulerVO codingRulerVO : codingRulerVOS){
- if (CodingRulerCodeTypeEnum.YELLOW.getValue().equals(codingRulerVO.getProjectCodeType())){
- yellowRuler = codingRulerVO;
- }else if (CodingRulerCodeTypeEnum.RED.getValue().equals(codingRulerVO.getProjectCodeType())){
- redRuler = codingRulerVO;
- }
}
//鑾峰緱鎵�鏈� 瓒呮椂浠诲姟鏁颁笌娴佺▼瀹炰緥id
- List<ProcessCodingVO> processCodingVOS = processCodingMapper.countProjectOverTimeNum();
- if (!CollectionUtils.isEmpty(processCodingVOS)){
+ List<ProcessOvertimeTimesVO> processOvertimeTimesVOS = processCodingMapper.countProjectOvertimeTimes();
+ if (!CollectionUtils.isEmpty(processOvertimeTimesVOS)){
//灏嗘祦绋嬪疄渚媔d杞崲涓簂ist
- List<String> processIds = processCodingVOS.stream().map(ProcessCodingVO::getProcessInsId).toList();
+ List<String> processIds = processOvertimeTimesVOS.stream().map(ProcessOvertimeTimesVO::getProcessInsId).toList();
//鑾峰緱鎵�鏈� 鏇村叿娴佺▼瀹氫箟id锛屾祦绋嬬浉鍏抽」鐩甶d锛� key涓烘祦绋媔d
Map<String, ProjectProcess> projectMap = new LambdaQueryChainWrapper<>(projectProcessMapper)
.in(ProjectProcess::getProcessInsId, processIds)
@@ -86,29 +76,29 @@
//鏂板鐨勮褰曢泦鍚�
- List<ProjectCodingStatus> addList = new ArrayList<>();
+ List<ProjectOvertimeTimes> addList = new ArrayList<>();
- for (ProcessCodingVO processCoding : processCodingVOS) {
+ for (ProcessOvertimeTimesVO processOvertimeTimesVO : processOvertimeTimesVOS) {
//鍒ゆ柇 椤圭洰绫诲瀷涓� ProjectProcessTypeEnum.PROJECT 骞朵笖瓒呮椂浠诲姟鏁板ぇ浜�0
- if (processCoding.getTaskOvertimeNum() != 0 && projectMap.containsKey(processCoding.getProcessInsId())) {
- ProjectCodingStatus projectCodingStatus = new ProjectCodingStatus();
- projectCodingStatus.setProjectType(ProjectProcessTypeEnum.PROJECT.getValue());
- projectCodingStatus.setProjectId(projectMap.get(processCoding.getProcessInsId()).getProjectId());
- projectCodingStatus.setProcessInsId(processCoding.getProcessInsId());
- projectCodingStatus.setTaskOvertimeNum(processCoding.getTaskOvertimeNum());
+ if (processOvertimeTimesVO.getTaskOvertimeNum() != 0 && projectMap.containsKey(processOvertimeTimesVO.getProcessInsId())) {
+ ProjectOvertimeTimes projectOvertimeTimes = new ProjectOvertimeTimes();
+ projectOvertimeTimes.setProjectType(ProjectProcessTypeEnum.PROJECT.getValue());
+ projectOvertimeTimes.setProjectId(projectMap.get(processOvertimeTimesVO.getProcessInsId()).getProjectId());
+ projectOvertimeTimes.setProcessInsId(processOvertimeTimesVO.getProcessInsId());
+ projectOvertimeTimes.setTaskOvertimeNum(processOvertimeTimesVO.getTaskOvertimeNum());
//娣诲姞鍒版柊澧為泦鍚堝唴
- addList.add(projectCodingStatus);
+ addList.add(projectOvertimeTimes);
//妫�楠岃祴鐮佽鍒�
- checkCodingType(projectCodingStatus.getTaskOvertimeNum(),
- projectCodingStatus.getProjectId(),
+ checkCodingType(projectOvertimeTimes.getTaskOvertimeNum(),
+ projectOvertimeTimes.getProjectId(),
yellowProjectCodingIds,redProjectCodingIds,
yellowRuler,redRuler);
}
}
if(!CollectionUtils.isEmpty(addList)){
- projectCodingStatusMapper.delAll();
- projectCodingStatusService.saveBatch(addList);
+ projectOvertimeTimesMapper.delAll();
+ projectOvertimeTimesService.saveBatch(addList);
}
//淇敼椤圭洰璧嬬爜
updateProjectCoding(redProjectCodingIds,"red");
--
Gitblit v1.8.0