From fe185a5eb4669e925af908153bdf21778551fdb4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 20:23:36 +0800
Subject: [PATCH] 增加固化流程文件内容比对接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 93 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
index 22d8e28..a19af2a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -1,5 +1,6 @@
package org.springblade.mdm.flow.service;
+import com.alibaba.excel.util.StringUtils;
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
@@ -7,14 +8,24 @@
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
+import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+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.program.entity.NcNode;
+import org.springblade.mdm.program.service.NodeDeptQueryService;
+import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
+import java.util.List;
import java.util.Map;
@AllArgsConstructor
@@ -22,7 +33,10 @@
public class FlowCommonService {
private final RuntimeService runtimeService;
private final HistoryService historyService;
-
+ private final ProduceDivisionService produceDivisionService;
+ private final NodeDeptQueryService nodeDeptQueryService;
+ private final MachineService machineService;
+ private final IUserClient userClient;
/**
* 鏍规嵁娴佺▼瀹炰緥id鑾峰彇definitionKey
* @param processInstanceId
@@ -48,6 +62,7 @@
Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
+ programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));
@@ -63,10 +78,15 @@
programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowContants.IS_PROCESS_EDITION_SAME)));
-
+ if(vars.containsKey(FlowContants.DEVIATION)) {
+ programProperties.setDeviation(String.valueOf(vars.get(FlowContants.DEVIATION)));
+ }
if(vars.containsKey(FlowContants.CURED_NODE_ID)){
programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
}
+ programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
+
+ programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
@@ -101,7 +121,76 @@
return historicInstance != null && historicInstance.getEndTime() == null;
}
+ /**
+ * 涓婁竴姝ュ鐞嗕汉
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return assignee
+ */
+ public String previusAssignee(String processInstanceId) {
+ // 鑾峰彇鍘嗗彶浠诲姟瀹炰緥
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInstanceId)
+ .orderByHistoricTaskInstanceEndTime().asc()
+ .list();
+ // 鑾峰彇涓婁竴涓凡瀹屾垚鐨勪换鍔�
+ String assignee = "";
+ if(!historicTasks.isEmpty()) {
+ assignee = historicTasks.get(historicTasks.size() - 1).getAssignee();
+ }
+ return assignee;
+ }
+
+ /**
+ * 灏嗛粯璁ゅ鎵圭敤鎴锋斁鍏ap涓�
+ * @param vars 鍚姩娴佺▼鐨勫彉閲弇ap
+ * @param drawingNo 闆剁粍浠跺彿
+ */
+ public ProduceDivision putDefaultAssignees(Map<String, Object> vars,String drawingNo,String defaultAssignee){
+ ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(drawingNo);
+ vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
+ vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowContants.CHECKER,div.getCheckerId());
+ vars.put(FlowContants.SENIOR,div.getSeniorId());
+ if(StringUtils.isNotBlank(defaultAssignee)) {
+ vars.put(FlowContants.ASSIGNEE, defaultAssignee);//绗竴涓鎵圭敤鎴凤細缁勯暱
+ }
+
+ R<User> programmerResult = userClient.userInfoById(div.getProgrammerId());
+ if(programmerResult.isSuccess()) {
+ vars.put(FlowContants.PROGRAMMER_NAME, programmerResult.getData().getName());
+ }
+ return div;
+ }
+
+ /**
+ * 鏍规嵁绋嬪簭鍖呭悕鑺傜偣锛屽～鍏呭彉閲弇ap
+ * @param vars
+ * @param programPackageNode
+ */
+ public void putFlowVariablesByNode(Map<String, Object> vars, NcNode programPackageNode){
+ //鏈哄簥缂栧彿
+ vars.put(FlowContants.MACHINE_CODE,programPackageNode.getMachineCode());
+ Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
+ //鏈哄簥鍨嬪彿
+ if(machine != null) {
+ vars.put(FlowContants.MACHINE_MODE, machine.getName());
+ }
+ vars.put(FlowContants.PROCESS_NO,programPackageNode.getProcessNo());
+ vars.put(FlowContants.PROCESS_NAME,programPackageNode.getProcessName());
+ vars.put(FlowContants.PROCESS_EDITION,programPackageNode.getProcessEdition());
+ vars.put(FlowContants.CRAFT_EDITION,programPackageNode.getCraftEdition());
+
+ vars.put(FlowContants.DRAWING_NO,programPackageNode.getDrawingNo());
+ vars.put(FlowContants.DRAWING_NO_EDITION,programPackageNode.getDrawingNoEdition());
+
+ vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackageNode.getName());
+
+ vars.put(FlowContants.PRODUCT_MODEL,programPackageNode.getProductModel());
+ vars.put(FlowContants.NODE_ID, programPackageNode.getId());
+ vars.put(FlowContants.WORKSHOP,nodeDeptQueryService.getWorkshopNameByMachineCode(programPackageNode.getMachineCode()));
+
+ }
}
--
Gitblit v1.9.3