From 432198337fb3d8a99fadb4b7825771d68bb10b9e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 19:58:22 +0800
Subject: [PATCH] 去掉mail依赖
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 149 +++++++++++++++++++++++++++++++------------------
1 files changed, 95 insertions(+), 54 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index c166cec..0d495f4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -1,86 +1,127 @@
package org.springblade.mdm.flow.service;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
+import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.flow.excution.AutoAssignUsersService;
-import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
+import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.mdm.program.service.NodeDeptQueryService;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
* 鍥哄寲娴佺▼鏈嶅姟
*/
+@Slf4j
@Service
+@AllArgsConstructor
public class CureFlowService {
- @Autowired
- private RuntimeService runtimeService;
- @Autowired
- private AutoAssignUsersService autoAssignUsersService;
- @Autowired
- private IdentityService identityService;
+ private final RuntimeService runtimeService;
- @Autowired
- private NcProgramService ncProgramService;
- @Autowired
- private NcNodeService ncNodeService;
- @Autowired
- private MachineService machineService;
- /**
- * 鍥哄寲娴佺▼鐨刱ey
- */
- private static final String PROCESS_KEY = "program-cure";
+ private final IdentityService identityService;
+ private final NodeDeptQueryService nodeDeptQueryService;
+ private final NcNodeService ncNodeService;
+
+ private final FlowProgramFileService flowProgramFileService;
+ private final ProduceDivisionService produceDivisionService;
+ private final MachineService machineService;
+ private final FlowCommonService flowCommonService;
/**
* 鍚姩鍥哄寲娴佺▼
- * @param programId 绋嬪簭id
*/
- public void start(long programId){
- Map<String, Object> vars = new HashMap<>();
- //NcProgram prog = ncProgramService.getById(programId);
- NcNode progNode = ncNodeService.getById(programId);
- Machine machine = machineService.getByCode(progNode.getMachineCode());
- vars.put("machineCode",machine.getCode());
- vars.put("machineMode",machine.getName());
- vars.put("processEdition",progNode.getProcessEdition());
- vars.put("programId",programId);
- vars.put("program",progNode);
-
-
- String businessKey = "0";//涓氬姟琛╧ey
-
- identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
-
- int a=1;
- //log.info()
+ @Transactional
+ public void startCureNew(Map<Long, List<FlowProgramFile>> pkgIdFileMap) {
+ pkgIdFileMap.forEach(this::startOneNew);
}
/**
- * 鐢熸垚闆剁粍浠剁紪鍙�
- * 鍥惧彿銆佸浘鍙风増娆°�佸伐搴忓彿銆佸伐搴忓悕绉般�佸伐鑹虹増娆°�佸伐搴忕増娆� 缁勫悎璧锋潵鑾峰緱闆剁粍浠跺彿
- * @param startVO
+ * 鍚姩涓�璋冪▼搴忕殑鍥哄寲娴佺▼
+ * @param nodeId
+ * @param fileList
+ */
+ private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
+ Map<String, Object> vars = new HashMap<>();
+ NcNode programPackage = this.ncNodeService.getById(nodeId);
+
+ vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
+ //鏈哄簥鍨嬪彿
+ //vars.put(FlowContants.MACHINE_MODE,programPackage.getm);
+ //鏈哄簥鍨嬪彿
+ Machine machine = machineService.getByCode(programPackage.getMachineCode());
+ if(machine != null) {
+ vars.put(FlowContants.MACHINE_MODE,machine.getName());
+ }
+
+ String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
+ vars.put(FlowContants.WORKSHOP,workshop);
+
+ vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
+ vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
+ vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
+ vars.put(FlowContants.CRAFT_EDITION, programPackage.getCraftEdition());
+ vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
+ vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());
+
+ vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
+
+ vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
+ /*
+
+ vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowContants.CHECKER,div.getCheckerId());
+ vars.put(FlowContants.SENIOR,div.getSeniorId());
+ vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
+ */
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
+ //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
+ vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
+
+
+ identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
+
+ vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
+ vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+
+ vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
+
+ //鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
+ programPackage.setProcessInstanceId(inst.getProcessInstanceId());
+ ncNodeService.updateById(programPackage);
+
+ for(FlowProgramFile flowProgramFile : fileList){
+ flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
+ }
+ this.flowProgramFileService.saveBatch(fileList);
+
+ log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
+ }
+ /**
+ * 灏嗙▼搴忔寜鐓ф満鍣ㄤ唬鐮佸垎缁�
+ * @param ncProgramIdList
* @return
*/
- String generatePartNo(TaskAssignVO startVO){
- //TODO 杩欎釜鏍煎紡鏈‘瀹氾紝闇�瑕佺‘璁�
- return String.format("%s-%s-%s-%s-%s-%s",
- startVO.getDrawingNo(),
- startVO.getDrawingNoEdition(),
- startVO.getProcessNo(),
- startVO.getProcessName(),
- startVO.getCraftEdition(),
- startVO.getProcessEdition());
- }
+ /*
+ Map<String,List<NcProgram>> groupProgramsByMachineCode(List<Long> ncProgramIdList){
+ List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
+ return programs.stream().collect(Collectors.groupingBy(NcProgram::getMachineCode));
+ }*/
}
--
Gitblit v1.9.3