From 71a55d8d0d886eb6e489a7b581eb799f3a8ad054 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 23 七月 2025 22:46:00 +0800
Subject: [PATCH] 增加流程列表中 “文件”列的显示方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 143 +++++++++++++++++++++++++++++++----------------
1 files changed, 95 insertions(+), 48 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 6b01c31..6acabc6 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,91 +1,138 @@
package org.springblade.mdm.flow.service;
+import lombok.AllArgsConstructor;
+import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
+import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.task.api.history.HistoricTaskInstance;
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.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.program.vo.DncSendBackData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 鍥哄寲娴佺▼鏈嶅姟
*/
@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;
+ private final HistoryService historyService;
+
+ private final IdentityService identityService;
+
+ private final NcProgramService ncProgramService;
+
+ private final MachineService machineService;
+
+ private final ProcessProgRefService processProgRefService;
/**
* 鍥哄寲娴佺▼鐨刱ey
*/
private static final String PROCESS_KEY = "program-cure";
- public void start(long programId){
- Map<String, Object> vars = new HashMap<>();
+
+
+ @Transactional
+ public void startCure(List<NcProgram> programs) {
+ //DncSendBackData sendBackData;
+ //List<Long> ncProgramIdList = dataList.stream().map(DncSendBackData::getId).toList();
+ //Map<String,List<NcProgram>> groupedProgram = groupProgramsByMachineCode(ncProgramIdList);
+ //List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
+ //鏍规嵁鍒嗙粍鍚姩娴佺▼锛屽苟鎻掑叆鍏宠仈琛�
+ programs.forEach(this::startOne);
+ }
+
+ /**
+ * 鍚姩涓�涓暟鎺х▼搴忕殑鍥哄寲娴佺▼
+ * @param prog 鏁版帶绋嬪簭瀹炰綋
+ */
+ public void startOne(NcProgram prog){
+
+ Map<String, Object> vars = null;
+ //璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
+ ProcessProgRef preRef = processProgRefService.lastDispatchDataByNcProgramId(prog.getId());
+ if(preRef != null) {
+ //鑾峰彇瀹℃壒鐢ㄦ埛
+ /*
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery().includeProcessVariables()
+ .processInstanceId(preRef.getProcessInstanceId())
+ .orderByHistoricTaskInstanceEndTime().desc()
+ .list();*/
+ HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
+ .processInstanceId(preRef.getProcessInstanceId()).includeProcessVariables()
+ .singleResult();
+ if(instance != null) {//浣跨敤浠诲姟娲惧伐娴佺▼鐨勫彉閲�
+ vars = new HashMap<>(instance.getProcessVariables());
+ }
+
+ }
+ if(vars == null){
+ vars = new HashMap<>();
+ }
/*
- Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
- Map<String, Object> vars = new HashMap<>(preAssignee);
+ String programmer = null;
+ String checker = null;
+ String senior = null;
- vars.put("machineCode",startVO.getMachineCode());
- vars.put("machineMode",startVO.getMachineMode());
+ for (HistoricTaskInstance task : historicTasks) {
+ // 鑾峰彇浠诲姟鐨勫姙鐞嗕汉
+ if(task.getTaskDefinitionKey().equals("programmingTask")){
+ //缂栧埗
+ programmer = task.getAssignee();
+ }else if(task.getTaskDefinitionKey().equals("check")){
+ //鏍″
+ checker = task.getAssignee();
+ }else if(task.getTaskDefinitionKey().equals("senior")){
+ //瀹℃牳
+ senior = task.getAssignee();
+ }
- vars.put("processNo",startVO.getProcessNo());
- vars.put("processName",startVO.getProcessName());
- vars.put("processEdition",startVO.getProcessEdition());
+ }*/
+ //vars.put("programmer",programmer);
+ //vars.put("checker",checker);
+ //vars.put("senior",senior);
- vars.put("craftEdition",startVO.getCraftEdition());
- vars.put("planStartTime",startVO.getPlanStartTime());
- vars.put("drawingNo",startVO.getDrawingNo());
- vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
- vars.put("planLockDays",startVO.getPlanLockDays());
-
- //闆剁粍浠朵唬鐮�
- String partNo = generatePartNo(startVO);
- vars.put("partNo",partNo);
-
- NcProgram curedNcProgram = ncProgramService.getCuredNcProgram(partNo,startVO.getMachineCode());
- vars.put("curedNcProgram",curedNcProgram);
-
- //璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
- vars.put("hasCuredProgram",curedNcProgram != null ? "Y":"N");
- */
String businessKey = "0";//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
- int a=1;
- //log.info()
+ ProcessProgRef ref = new ProcessProgRef();
+ ref.setProcessInstanceId(pinst.getId());
+ ref.setNcProgramId(prog.getId());
+
+ processProgRefService.save(ref);
}
/**
- * 鐢熸垚闆剁粍浠剁紪鍙�
- * 鍥惧彿銆佸浘鍙风増娆°�佸伐搴忓彿銆佸伐搴忓悕绉般�佸伐鑹虹増娆°�佸伐搴忕増娆� 缁勫悎璧锋潵鑾峰緱闆剁粍浠跺彿
- * @param startVO
+ * 灏嗙▼搴忔寜鐓ф満鍣ㄤ唬鐮佸垎缁�
+ * @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