From a638cb450abb78346ecf19754b639fc945bc486b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 19:21:16 +0800
Subject: [PATCH] zip包判断修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/task/cure/CureFinishOperateTask.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 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 2d2ece0..bf874c4 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
@@ -3,14 +3,20 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.delegate.DelegateExecution;
+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.entity.NcProgram;
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
@@ -20,6 +26,11 @@
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
@@ -29,7 +40,6 @@
//鍥哄寲绋嬪簭妫�鏌ユ湁鏁堟湡锛�
//1.灏嗘祦绋嬭缃�
dealWithNode(execution.getProcessInstanceId());
-
}
/**
@@ -40,11 +50,19 @@
//绋嬪簭鍖呰妭鐐瑰拰涓嬪睘绋嬪簭鑺傜偣(鍖呮嫭鍘嗗彶鑺傜偣闈炴渶鏂扮増鏈殑)浠庤瘯鍒囨尓鍒板浐鍖栦笅闈�
//绋嬪簭鍖呰妭鐐� 璁剧疆鏈凡鍥哄寲
NcNode pkgNode = nodeService.lambdaQuery().eq(NcNode::getProcessInstanceId, processInstanceId).one();
- pkgNode.setIsCured(1);
+ if(pkgNode.isDeviation()){
+ //鍋忕鐨勭▼搴忕洿鎺ラ攣瀹�
+ pkgNode.setIsLocked(1);
+ nodeService.updateById(pkgNode);
+ }else {
+ pkgNode.setIsCured(1);
+ //璁剧疆杩囨湡鏃ユ湡
+ pkgNode.setExpireDate(calculateExpireDate());
+ nodeService.updateById(pkgNode);
- List<NcNode> historyNodes = nodeService.getNodeHistorys(pkgNode);
- moveNodeToCuredTree(pkgNode,historyNodes,flowCommonService.getProgramProperties(processInstanceId));
-
+ List<NcNode> historyNodes = nodeService.getNodeHistory(pkgNode);
+ moveNodeToCuredTree(pkgNode, historyNodes, flowCommonService.getProgramProperties(processInstanceId));
+ }
}
/**
@@ -52,29 +70,49 @@
* @param historyNodes
*/
void moveNodeToCuredTree(NcNode pkgNode,List<NcNode> historyNodes, FlowProgramProperties programProperties) {
- NcNode node = historyNodes.get(0);
//鍒涘缓鑺傜偣鍒版満搴婄骇鍒�.(鍥哄寲鏍�)
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.getParentId());
+ hisNode.setParentId(machineNode.getId());
hisNode.setParentIds(newParentIds);
//澶勭悊绋嬪簭鍖呬笅灞傜殑绋嬪簭鑺傜偣
- List<NcNode> pragramNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,hisNode.getId()).list();
- for(NcNode pragramNode : pragramNodes){
- pragramNode.setParentIds(hisNode.getParentIds()+","+hisNode.getId());
+ List<NcNode> programNodes = nodeService.lambdaQuery().eq(NcNode::getParentId,hisNode.getId()).list();
+ for(NcNode programNode : programNodes){
+ programNode.setParentIds(hisNode.getParentIds()+","+hisNode.getId());
}
- nodeService.updateBatchById(pragramNodes);
+ 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