From a0881c9a8dbff2bf7f3e10255b998b9529c7aef3 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 07 八月 2025 13:46:36 +0800
Subject: [PATCH] 优化代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 99 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java
index 78864a6..3d508da 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java
@@ -1,19 +1,112 @@
package org.springblade.mdm.flow.task.cure;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.delegate.DelegateExecution;
-import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.mdm.commons.contants.ParamContants;
+import org.springblade.mdm.flow.service.FlowCommonService;
+import org.springblade.mdm.flow.service.FlowProgramProperties;
+import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.service.NcNodeAutoCreateService;
+import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.system.feign.ISysClient;
import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
@Slf4j
@Component("cureFinishOperateTask")
+@AllArgsConstructor
public class CureFinishOperateTask {
-
+ private final NcNodeService nodeService;
+ private final NcNodeAutoCreateService ncNodeAutoCreateService;
+ private final FlowCommonService flowCommonService;
+ private final ISysClient sysClient;
+ /**
+ * 榛樿鏈夋晥鏈熼棿锛堟湀鏁帮級,2骞�
+ */
+ private static final int DEFAULT_VALID_MONTH = 24;
+ /**
+ * 鍥哄寲瀹℃壒閫氳繃澶勭悊浠诲姟锛�
+ * @param execution 娴佺▼execution
+ */
public void execute(DelegateExecution execution) {
+ log.info("鎵ц鍥哄寲绋嬪簭浠诲姟鏈嶅姟,娴佺▼瀹炰緥id={}", execution.getProcessInstanceId());
//鍥哄寲绋嬪簭妫�鏌ユ湁鏁堟湡锛�
- String hasCuredProgram = (String)execution.getVariable("hasCuredProgram");
- NcProgram ncProgram = (NcProgram)execution.getVariable("curedNcProgram");
-
- System.out.println("鎵ц鍥哄寲绋嬪簭浠诲姟鏈嶅姟");
+ //1.灏嗘祦绋嬭缃�
+ dealWithNode(execution.getProcessInstanceId());
}
+
+ /**
+ * 澶勭悊node鐘舵�併��
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ */
+ void dealWithNode(String processInstanceId) {
+ //绋嬪簭鍖呰妭鐐瑰拰涓嬪睘绋嬪簭鑺傜偣(鍖呮嫭鍘嗗彶鑺傜偣闈炴渶鏂扮増鏈殑)浠庤瘯鍒囨尓鍒板浐鍖栦笅闈�
+ //绋嬪簭鍖呰妭鐐� 璁剧疆鏈凡鍥哄寲
+ NcNode pkgNode = nodeService.lambdaQuery().eq(NcNode::getProcessInstanceId, processInstanceId).one();
+ pkgNode.setIsCured(1);
+ //璁剧疆杩囨湡鏃ユ湡
+ pkgNode.setExpireDate(calculateExpireDate());
+ nodeService.updateById(pkgNode);
+
+ List<NcNode> historyNodes = nodeService.getNodeHistory(pkgNode);
+ moveNodeToCuredTree(pkgNode,historyNodes,flowCommonService.getProgramProperties(processInstanceId));
+ }
+
+ /**
+ * 灏嗚妭鐐瑰拰鍘嗗彶鑺傜偣鎸姩鍒板浐鍖栫殑鍚岀骇鑺傜偣涓�
+ * @param historyNodes
+ */
+ void moveNodeToCuredTree(NcNode pkgNode,List<NcNode> historyNodes, FlowProgramProperties programProperties) {
+ //鍒涘缓鑺傜偣鍒版満搴婄骇鍒�.(鍥哄寲鏍�)
+ NcNode machineNode = ncNodeAutoCreateService.createNodeTreeToMachine(programProperties);
+
+ //绉诲姩鍒板浐鍖栨爲涓嬬殑鏈哄簥鑺傜偣涓嬪眰
+ String newParentIds = machineNode.getParentIds()+","+machineNode.getId();
+
+ //鏇存柊鏈哄簥 涓嬪睘鑺傜偣鐨勬暟鎹� 涓烘棫鐗堟湰锛岄攣瀹�(鏈�鏂扮増鏈�=0锛宭ock=1)
+ this.nodeService.lambdaUpdate().likeRight(NcNode::getParentIds, newParentIds)
+ .in(NcNode::getNodeType, Arrays.asList(NcNode.TYPE_PROGRAM_PACKAGE,NcNode.TYPE_PROGRAM_FILE))
+ .set(NcNode::getIsLastEdition,0).set(NcNode::getIsLocked,1).update();
+
+ for(NcNode hisNode : historyNodes){
+ if(!hisNode.getId().equals(pkgNode.getId())){
+ hisNode.setIsLastEdition(0);
+ }
+ hisNode.setParentId(machineNode.getId());
+ hisNode.setParentIds(newParentIds);
+
+ //澶勭悊绋嬪簭鍖呬笅灞傜殑绋嬪簭鑺傜偣
+ List<NcNode> programNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,hisNode.getId()).list();
+ for(NcNode programNode : programNodes){
+ programNode.setParentIds(hisNode.getParentIds()+","+hisNode.getId());
+ }
+ nodeService.updateBatchById(programNodes);
+ }
+ nodeService.updateBatchById(historyNodes);
+
+ }
+
+ /**
+ * 璁＄畻鏈夋晥鏈�
+ * @return
+ */
+ private Date calculateExpireDate() {
+ R<String> validMonResult = sysClient.getParamValue(ParamContants.CURE_VALID_MONTH_KEY);
+
+ int month = DEFAULT_VALID_MONTH;
+ if(validMonResult.isSuccess() && validMonResult.getData()!=null){
+ month = Integer.parseInt(validMonResult.getData());
+ }
+
+ LocalDate now = LocalDate.now();
+ return DateUtil.toDate(now.plusMonths(month));
+ }
+
}
--
Gitblit v1.9.3