From 9bc9760ef1d80c49a76b3abe16cb1408e5d185b7 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 08 八月 2025 11:46:57 +0800
Subject: [PATCH] 替换流程基本实现
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 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 387a907..11e0ec2 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
@@ -3,29 +3,22 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
-import org.flowable.common.engine.impl.identity.Authentication;
import org.flowable.engine.IdentityService;
import org.flowable.engine.runtime.ProcessInstance;
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.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
-import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
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;
@@ -39,8 +32,6 @@
private final IdentityService identityService;
private final NcNodeService ncNodeService;
- //private final ProcessProgRefService processProgRefService;
- //private final NcProgramService ncProgramService;
private final FlowProgramFileService flowProgramFileService;
@@ -49,8 +40,10 @@
/**
* 鍚姩娲惧伐娴佺▼
* @param startVO
+ * @return 娴佺▼瀹炰緥id
*/
- public void start(TaskAssignVO startVO){
+ @Transactional
+ public String start(TaskAssignVO startVO){
Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO);
Map<String, Object> vars = new HashMap<>(preAssignee);
@@ -62,25 +55,16 @@
//鏈哄簥鍨嬪彿
vars.put(FlowContants.MACHINE_MODE,startVO.getMachineMode());
-
vars.put(FlowContants.PROCESS_NO,startVO.getProcessNo());
-
vars.put(FlowContants.PROCESS_NAME,startVO.getProcessName());
-
vars.put(FlowContants.PROCESS_EDITION,startVO.getProcessEdition());
-
vars.put(FlowContants.CRAFT_EDITION,startVO.getCraftEdition());
vars.put("planStartTime",startVO.getPlanStartTime());
-
-
vars.put(FlowContants.DRAWING_NO,startVO.getDrawingNo());
-
vars.put(FlowContants.DRAWING_NO_EDITION,startVO.getDrawingNoEdition());
vars.put("planLockDays",startVO.getPlanLockDays());
vars.put(FlowContants.PRODUCT_MODEL,startVO.getProductModel());
-
- //List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
NcNode programPkg = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
@@ -99,19 +83,39 @@
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);
- if(programPkg != null) {
- copyFlowProgramFiles(programPkg,inst.getProcessInstanceId());
+ if(programPkg != null) {//瀛樺湪宸插浐鍖栫▼搴忥紝澶嶅埗鍘熸潵鐨勭▼搴忔枃浠躲�傚垱寤鸿妭鐐逛粛鐒跺湪缂栫▼浜哄憳鎻愪氦浠ュ悗
+ //programPkg.setIsLastEdition(0);
+ //this.ncNodeService.updateById(programPkg);
+
+ //cloneNodes(programPkg,inst.getProcessInstanceId());
+ copyFlowProgramFiles(programPkg.getProcessInstanceId(),inst.getProcessInstanceId());
}
+ return inst.getProcessInstanceId();
+ }
+
+ /**
+ * 鏍规嵁鍘熸湁鍥哄寲绋嬪簭鍖呭悕鑺傜偣锛屽鍒朵竴涓紝璧嬩簣鏂扮殑娴佺▼瀹炰緥id
+ * @param programPkg 鍘熸湁鍥哄寲鐨勭▼搴忓寘鍚嶈妭鐐�
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ */
+
+ void cloneNodes(NcNode programPkg,String processInstanceId){
+ NcNode newProgramPkg = new NcNode();
+ BeanUtils.copyProperties(programPkg,newProgramPkg);
+ EntityUtil.clearBaseProperties(newProgramPkg);
+
+ newProgramPkg.setProcessInstanceId(processInstanceId);
+ this.ncNodeService.save(newProgramPkg);
}
/**
* 澶嶅埗娴佺▼绋嬪簭鏂囦欢
- * @param programPkg 鍘熷鐨勫浐鍖栫▼搴忓寘鍚嶈妭鐐�
+ * @param processInstanceId 鏂板惎鍔ㄧ殑娴佺▼id
*/
- private void copyFlowProgramFiles(NcNode programPkg,String processInstanceId) {
+ private void copyFlowProgramFiles(String oldProcessInstanceId,String processInstanceId) {
List<FlowProgramFile> fileList = flowProgramFileService.lambdaQuery()
- .eq(FlowProgramFile::getProcessInstanceId,programPkg.getProcessInstanceId()).list();
+ .eq(FlowProgramFile::getProcessInstanceId,oldProcessInstanceId).list();
for (FlowProgramFile file : fileList) {
FlowProgramFile newFile = new FlowProgramFile();
--
Gitblit v1.9.3