From 2689c8fec95018952784bd8d032afb5a194a6616 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 02 九月 2025 00:17:45 +0800
Subject: [PATCH] 增加文件监控
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 143 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 136 insertions(+), 7 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 c19f79a..a79f69a 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
@@ -4,20 +4,21 @@
import lombok.AllArgsConstructor;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
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.service.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;
@@ -28,6 +29,9 @@
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
@@ -51,8 +55,10 @@
programProperties.setProcessInstanceId(processInstanceId);
Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
-
+ this.copyFlowPropertiesFromMap(programProperties, vars);
+ /*
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)));
@@ -74,9 +80,16 @@
if(vars.containsKey(FlowContants.CURED_NODE_ID)){
programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
}
+ if(vars.containsKey(FlowContants.NODE_ID)){
+ programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
+ }
programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
-
+ programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
+ programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
+ programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
+ programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+ */
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
.singleResult();
@@ -84,7 +97,90 @@
programProperties.setProcessDefinitionKey(processDefinitionKey);
return programProperties;
}
+ public FlowProgramProperties getProgramPropertiesFromHis(String processInstanceId) {
+ HistoricProcessInstance historicInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables()
+ .processInstanceId(processInstanceId)
+ .singleResult();
+ FlowProgramProperties programProperties = new FlowProgramProperties();
+ programProperties.setProcessInstanceId(processInstanceId);
+
+ Map<String, Object> vars =historicInstance.getProcessVariables();
+ this.copyFlowPropertiesFromMap(programProperties,vars);
+ /*
+ 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)));
+
+ programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
+ programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//宸ュ簭鐗堟
+ programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
+ programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
+
+ programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
+ //鏁版嵁澶勭悊鍚嶇О涓虹増娆′互鍓嶏紝闆朵欢鍙峰姞宸ュ簭鍙凤細YZL4-1100-01-50 闆剁粍浠跺彿锛歒ZL4-1100-01 宸ュ簭鍙� 50
+
+ 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)));
+ }
+ if(vars.containsKey(FlowContants.NODE_ID)){
+ programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
+ }
+ programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
+
+ programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
+ programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
+ programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
+ programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+ */
+ programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
+ return programProperties;
+ }
+
+ void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){
+
+ 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)));
+
+ programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
+ programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//宸ュ簭鐗堟
+ programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
+ programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
+
+ programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
+ //鏁版嵁澶勭悊鍚嶇О涓虹増娆′互鍓嶏紝闆朵欢鍙峰姞宸ュ簭鍙凤細YZL4-1100-01-50 闆剁粍浠跺彿锛歒ZL4-1100-01 宸ュ簭鍙� 50
+
+ 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)));
+ }
+ if(vars.containsKey(FlowContants.NODE_ID)){
+ programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
+ }
+ programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
+
+ programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
+ programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
+ programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
+ programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+
+ }
/**
* 娴佺▼鏄惁鍦ㄨ繘琛�
* @param processInstanceId 瀹炰緥id
@@ -145,8 +241,41 @@
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