From fcee672452c02cc29e0e17ebc27a8c51698c6d0d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 17:28:44 +0800
Subject: [PATCH] 优化程序注释
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 213 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 188 insertions(+), 25 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index 8a7313a..685ec8e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -1,46 +1,209 @@
package org.springblade.mdm.flow.excution;
-import org.flowable.common.engine.impl.identity.Authentication;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.IdentityService;
import org.flowable.engine.runtime.ProcessInstance;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
-import org.springblade.flow.core.feign.IFlowClient;
-import org.springblade.flow.core.pojo.entity.BladeFlow;
-import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
+import org.springblade.mdm.commons.service.UserCommonService;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
+import org.springblade.mdm.flow.service.FlowCommonService;
+import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.program.service.NodeDeptQueryService;
+import org.springblade.mdm.program.service.ProgramSeqService;
+import org.springblade.mdm.utils.EntityUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.flowable.engine.RuntimeService;
+import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+@AllArgsConstructor
@Service("startDispatcher")
public class StartDispatcher {
- @Autowired
- private IFlowClient flowClient;
- @Autowired
- private RuntimeService runtimeService;
- @Autowired
- private AutoAssignUsersService autoAssignUsersService;
- @Autowired
- private IdentityService identityService;
- private static final String PROCESS_KEY = "dispatch";
+ private final RuntimeService runtimeService;
+ private final ProgramSeqService programSeqService;
+ private final IdentityService identityService;
+ private final NcNodeService ncNodeService;
+ private final MachineService machineService;
+ private final FlowProgramFileService flowProgramFileService;
+ private final NodeDeptQueryService nodeDeptQueryService;
+ private final FlowCommonService flowCommonService;
+ private final ProduceDivisionService produceDivisionService;
+ private final UserCommonService userCommonService;
+ /**
+ * 鍚姩娲惧伐娴佺▼
+ * @param startVO 琛ㄥ崟鏁版嵁
+ * @return 娴佺▼瀹炰緥id
+ */
+ @Transactional
+ public FlowStartResult start(TaskAssignVO startVO){
+ if(!FlowConstant.Y.equals(startVO.getIsTempFlow())){
+ startVO.setIsTempFlow(FlowConstant.N);
+ }
+ Map<String, Object> vars = new HashMap<>();
- public void start(TaskAssignVO startVO){
+ ProduceDivision div;
+ if(startVO.getProducePlanId() != null && startVO.getProducePlanId()!=0){
+ //鐣岄潰涓婇�夋嫨浜嗗垎宸ヨ〃鐨勬儏鍐碉紝鐩存帴鏍规嵁id鑾峰彇
+ div = produceDivisionService.getById(startVO.getProducePlanId());
+ vars.put(FlowVariableConstant.TEAM_LEADER,div.getTeamLeaderId());
+ vars.put(FlowVariableConstant.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowVariableConstant.CHECKER,div.getCheckerId());
+ vars.put(FlowVariableConstant.SENIOR,div.getSeniorId());
- Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
- Map<String, Object> vars = new HashMap<>(preAssignee);
+ vars.put(FlowConstant.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
- String businessKey = "0";//涓氬姟琛╧ey
+ }else {
+ div = flowCommonService.putDefaultAssignees(vars, startVO.getDrawingNo(), null);
+ }
+ vars.put(FlowVariableConstant.TITLE,startVO.getTitle());
+ addLastStepUserName(startVO,vars);
+
+ //鏈哄簥缂栧彿
+ vars.put(FlowVariableConstant.MACHINE_CODE,startVO.getMachineCode());
+ String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(startVO.getMachineCode());
+ vars.put(FlowVariableConstant.WORKSHOP,workshop);
+ //鏈哄簥鍨嬪彿
+
+ Machine machine = machineService.getByCode(startVO.getMachineCode());
+ if(machine == null){
+ throw new ServiceException("閿欒鐨勮澶囩紪鐮侊細"+startVO.getMachineCode());
+ }
+ vars.put(FlowVariableConstant.MACHINE_MODE,machine.getName());
+ vars.put(FlowVariableConstant.MACHINE_GROUP_CODE,machine.getMachineGroupCode());
+
+ vars.put(FlowVariableConstant.PROCESS_NO,startVO.getProcessNo());
+ vars.put(FlowVariableConstant.PROCESS_NAME,startVO.getProcessName());
+ vars.put(FlowVariableConstant.PROCESS_EDITION,startVO.getProcessEdition());
+ vars.put(FlowVariableConstant.CRAFT_EDITION,startVO.getCraftEdition());
+ vars.put("planStartTime",startVO.getPlanStartTime());
+ vars.put(FlowVariableConstant.DRAWING_NO,startVO.getDrawingNo());
+ vars.put(FlowVariableConstant.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
+ vars.put("planLockDays",startVO.getPlanLockDays());
+ vars.put(FlowVariableConstant.PRODUCT_MODEL,startVO.getProductModel());
+
+ if(StringUtils.isNotBlank(startVO.getDeviation())) {
+ vars.put(FlowVariableConstant.DEVIATION, startVO.getDeviation());//鍋忕鍗�
+ }
+ String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo(),startVO.getProcessEdition());
+ vars.put(FlowVariableConstant.PROGRAM_PACKAGE_NAME,programPkgName);
+
+ vars.put(FlowVariableConstant.IS_TEMP_FLOW, FlowConstant.Y.equals(startVO.getIsTempFlow())? FlowConstant.Y: FlowConstant.N);
+ NcNode curedProgramPackage = null;
+ if(!startVO.isTemporaryFlow() && !startVO.isDeviationFlow()) {
+ //姝ｅ父娴佺▼(闈炰复鏃舵祦绋�) 涓斾笉鏄� 鍋忕鍗�,鎵嶅尮閰嶅浐鍖栫▼搴�
+ curedProgramPackage = ncNodeService.getLastCuredProgramWithoutProcessEdition(startVO.getDrawingNo(),startVO.getProcessNo(),startVO.getMachineCode());
+ //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
+ vars.put(FlowVariableConstant.HAS_CURED_PROGRAM, curedProgramPackage != null ? FlowConstant.Y : FlowConstant.N);
+ //宸ュ簭鐗堟鏄惁涓�鑷达紝鏄惁鍦ㄦ湁鏁堟湡鍐�
+ if (curedProgramPackage != null) {
+ vars.put(FlowVariableConstant.CURED_NODE_ID, curedProgramPackage.getId());
+ vars.put(FlowVariableConstant.CURED_LOCKED, curedProgramPackage.hasLocked()? FlowConstant.Y: FlowConstant.N);
+ vars.put(FlowVariableConstant.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(), startVO.getProcessEdition()) ? FlowConstant.Y : FlowConstant.N);
+ vars.put("curedProcessEdition", curedProgramPackage.getProcessEdition());
+ vars.put(FlowVariableConstant.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowConstant.Y : FlowConstant.N);
+ } else {
+ vars.put(FlowVariableConstant.IS_PROCESS_EDITION_SAME, FlowConstant.Y);
+ vars.put(FlowVariableConstant.VALIDITY_PERIOD, FlowConstant.Y);
+ }
+
+ }else{
+ //涓存椂娴佺▼/鍋忕鍗曪紝涓嶅尮閰嶅浐鍖栫▼搴�
+ vars.put(FlowVariableConstant.HAS_CURED_PROGRAM, FlowConstant.N);
+ }
+ String myProcessName = "璇曞垏涓嬪彂娴佺▼";
+ if(vars.getOrDefault(FlowVariableConstant.IS_TEMP_FLOW, FlowConstant.N).equals(FlowConstant.Y)){
+ myProcessName = "璇曞垏琛ュ厖娴佺▼";
+ }else if(StringUtils.isNotBlank(startVO.getDeviation()) ){
+ myProcessName = "涓存椂鏇存敼鍗�";
+ }else if(vars.getOrDefault(FlowVariableConstant.HAS_CURED_PROGRAM, FlowConstant.N).equals(FlowConstant.Y)){
+ myProcessName = "鍥哄寲涓嬪彂娴佺▼";
+ }
+
+ vars.put(FlowVariableConstant.MY_PROCESS_NAME, myProcessName);
+
+ String businessKey = Func.toStr(startVO.getTaskDispatchId());//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
- //R<BladeFlow> flowR = flowClient.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
- //R<BladeFlow> flowR = flowClient.startProcessInstanceById(PROCESS_KEY,businessKey,vars);
+ ProcessInstance inst;
+ if(startVO.isTemporaryFlow()){
+ vars.put(FlowVariableConstant.ASSIGNEE,div.getProgrammerId());//绗竴涓敤鎴风紪鍒朵笂浼犳枃浠�
+ vars.put(FlowConstant.PROGRAMMER_NAME,userCommonService.getUserNameById(div.getProgrammerId()));//缂栫▼鍛樺鍚�
- int a=1;
- a =2;
- //log.info()
+ inst = runtimeService.startProcessInstanceByKey(FlowConstant.APPEND_PROCESS_KEY,businessKey,vars);
+ }else{
+ vars.put(FlowVariableConstant.ASSIGNEE,div.getTeamLeaderId());//绗竴涓敤鎴风粍闀�
+ inst = runtimeService.startProcessInstanceByKey(FlowConstant.TRY_PROCESS_KEY,businessKey,vars);
+ }
+ FlowStartResult result = new FlowStartResult();
+ result.setProcessInstanceId(inst.getProcessInstanceId());
+ //鐢熸垚绋嬪簭缂栧彿
+ String programNo = programSeqService.generageProgramNo();
+ runtimeService.setVariable(inst.getProcessInstanceId(), FlowVariableConstant.PROGRAM_NO,programNo);
+ result.setProgramNo(programNo);
+
+ if(curedProgramPackage != null) {//瀛樺湪宸插浐鍖栫▼搴忥紝澶嶅埗鍘熸潵鐨勭▼搴忔枃浠躲��
+ copyFlowProgramFiles(curedProgramPackage.getId(),inst.getProcessInstanceId());
+ curedProgramPackage.setProcessInstanceId(inst.getProcessInstanceId());
+ ncNodeService.updateById(curedProgramPackage);
+ }
+
+ return result;
}
+
+ /**
+ * 娴佺▼鍙橀噺涓姞鍏ヤ笂涓�姝ュ鐞嗕簡浜猴紙鍙戣捣浜猴級
+ * @param startVO 鍚姩vo
+ * @param vars 娴佺▼鍙橀噺map
+ */
+ private void addLastStepUserName(TaskAssignVO startVO, Map<String, Object> vars) {
+ if(startVO.getDispatchBy() != null) {
+ vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, startVO.getDispatchBy());
+ }else{
+ if(startVO.getCreateUser() != null) {
+ vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, this.userCommonService.getUserNameById(startVO.getCreateUser()));
+ }else{
+ vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME,"MES绯荤粺");
+ }
+ }
+ }
+
+
+ /**
+ * 澶嶅埗娴佺▼绋嬪簭鏂囦欢
+ * @param processInstanceId 鏂板惎鍔ㄧ殑娴佺▼id
+ */
+ private void copyFlowProgramFiles(long packageNameNodeId,String processInstanceId) {
+ List<Long> fileIds = ncNodeService.getProgramFilesByPackageId(packageNameNodeId).stream().map(NcNode::getFlowProgramFileId).toList();
+ if(!fileIds.isEmpty()) {
+ List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery().in(FlowProgramFile::getId, fileIds).list();
+
+ for (FlowProgramFile file : fileList) {
+ FlowProgramFile newFile = new FlowProgramFile();
+ BeanUtils.copyProperties(file, newFile);
+ EntityUtil.clearBaseProperties(newFile);
+
+ newFile.setProcessInstanceId(processInstanceId);
+
+ this.flowProgramFileService.save(newFile);
+ }
+ }
+ }
+
+
}
--
Gitblit v1.9.3