From a0f3e98fdd9472af3c78b42423a7e3fa6fb92eba Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 14:28:55 +0800
Subject: [PATCH] 清理无用老代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java | 78 ++++++++++++++------------------------
1 files changed, 29 insertions(+), 49 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
index 9db87c3..45bf536 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/cure/NormalCureFinishDataHandler.java
@@ -7,23 +7,20 @@
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.contants.ParamConstants;
-import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.dispatch.FinishDataHandler;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.mdm.program.service.ProgramAnnotationService;
+import org.springblade.mdm.program.service.programannotation.AnnotationProperties;
+import org.springblade.mdm.program.service.programannotation.AnnotationUtil;
+import org.springblade.mdm.program.service.programannotation.MachineAnnotationConfig;
import org.springblade.mdm.utils.EntityUtil;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.pojo.entity.DictBiz;
@@ -47,9 +44,8 @@
@Component("normalCureFinishDataHandler")
public class NormalCureFinishDataHandler implements FinishDataHandler {
@Autowired
- private NcProgramApprovedService approvedService;
- @Autowired
- private ApproveRecordService approveRecordService;
+ private MachineAnnotationConfig config;
+
@Autowired
private FlowProgramFileService flowProgramFileService;
@Autowired
@@ -74,13 +70,9 @@
* @param flowProps 娴佺▼灞炴��
*/
public void handleData(FlowProgramProperties flowProps) {
- // 鎵ц涓氬姟閫昏緫
//闇�瑕佸浐鍖栫殑鑺傜偣
NcNode pkgNode = nodeService.lambdaQuery().eq(NcNode::getProcessInstanceId, flowProps.getProcessInstanceId()).one();
-
- //pkgNode.setIsLastEdition(0);
- //nodeService.updateById(pkgNode);
List<NcNode> historyProgramPackageNodes = nodeService.getNodeHistory(pkgNode);
try {
@@ -90,14 +82,12 @@
throw new ServiceException("鏅�氬浐鍖栨墽琛屽紓甯�"+e.getMessage());
}
- //鍥哄寲娴佺▼锛屼笉鐢ㄥ啀瀵煎嚭
- updateApproveRecordNodeId(flowProps.getProcessInstanceId(), pkgNode.getId());
}
/**
* 灏嗚妭鐐瑰拰鍘嗗彶鑺傜偣鎸姩鍒板浐鍖栫殑鍚岀骇鑺傜偣涓�
- * @param pkgNode 瑕佸浐鍖栫殑鑺傜偣
+ * @param pkgNode1 瑕佸浐鍖栫殑鑺傜偣
* @param historyProgramPackageNodes 绋嬪簭鍖呭悕 鍘嗗彶鑺傜偣
*/
void moveNodeToCuredTree(NcNode pkgNode1,List<NcNode> historyProgramPackageNodes, FlowProgramProperties programProperties) throws IOException {
@@ -111,17 +101,16 @@
//鏂板缓涓�涓妭鐐癸紝浣滀负鍥哄寲鑺傜偣锛岃�佽妭鐐逛繚鐣欎笉鍔�,缃负鑰佺増鏈�
//鏈哄簥涓嬬幇鍦ㄦ病鏈夋枃浠朵簡锛岀▼搴忓寘鍚嶅崌绾т笌鏈哄簥鍚岀骇浜嗭紝鏀逛负鎵惧埌鏈哄簥鍚岀骇绋嬪簭鍖呭悕鏇存柊浜�
- //TODO 杩欎釜parentIds鏄笉鏄笉澶燂紵锛屼笉澶燂紝涓�涓満搴婁笅澶氫釜绋嬪簭鍖呯殑鎯呭喌涓嶈鍚э紝浣嗘槸鎸夌収鏍戯紝澶氫釜绋嬪簭鍖呬笉澶幇瀹�
this.nodeService.lambdaUpdate().likeRight(NcNode::getParentIds, machineNode.getParentIds())
.in(NcNode::getNodeType, Arrays.asList(NcNode.TYPE_PROGRAM_PACKAGE,NcNode.TYPE_PROGRAM_FILE))
- //.ne(NcNode::getId,cureNode.getId())//涓嶈鏇存柊鏂板浐鍖栫殑鑺傜偣
.set(NcNode::getIsLastEdition,0).set(NcNode::getIsLocked,1).update();
- NcNode cureNode = createNewCureNodeByTargetNode(pkgNode1);
+ List<NcNode> programNodes = nodeService.getProgramFilesByPackageId(pkgNode1.getId());
+ boolean tryPkdNodeHasChild = !programNodes.isEmpty();
+ NcNode cureNode = createNewCureNodeByTargetNode(pkgNode1,tryPkdNodeHasChild);
+
for(NcNode hisPackageNode : historyProgramPackageNodes){
- //if(!hisPackageNode.getId().equals(pkgNode.getId())){
- hisPackageNode.setIsLastEdition(0);
- //}
+ hisPackageNode.setIsLastEdition(0);
hisPackageNode.setParentId(machineNode.getParentId());
hisPackageNode.setParentIds(machineNode.getParentIds());//绋嬪簭鍖呬笌鏈哄簥鑺傜偣鍚岀骇
@@ -130,12 +119,11 @@
FlowProgramFile pfile;
for(NcNode oldProgramNode : oriProgramNodes){
oldProgramNode.setParentIds(hisPackageNode.getParentIds()+","+hisPackageNode.getId());
- //oldProgramNode.setIsLastEdition(0);
pfile = flowProgramFileService.getById(oldProgramNode.getFlowProgramFileId());
if(oldProgramNode.getParentId().equals(pkgNode1.getId()) && !pfile.isProgram()){
+
//褰撳墠鍥哄寲绋嬪簭鍖呭悕涓嬬殑鈥滃叾浠栨枃浠垛�濋潪绋嬪簭鏂囦欢銆備笉璁剧疆涓鸿�佺増鏈紝鐩存帴鎸埌鍥哄寲鏍戜笅,涓や釜缃戠粶涔嬮棿鍙氦鎹㈢▼搴忔枃浠讹紝鍏朵粬鏂囦欢鍙兘淇濈暀
- //oldProgramNode.setIsLastEdition(1);
//鍏朵粬鏂囦欢锛岄渶瑕佸鍒跺埌鏂板缓鐨勫浐鍖栬妭鐐逛笅
NcNode newOtherFileNode = new NcNode();
BeanUtils.copyProperties(oldProgramNode,newOtherFileNode);
@@ -152,7 +140,7 @@
nodeService.updateBatchById(historyProgramPackageNodes);
Machine machine = machineService.getByCode(cureNode.getMachineCode());
- List<DictBiz> annoDicts = programAnnotationService.getAnnotionList();
+ List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
//鏂扮殑娴佺▼鏂囦欢锛岄渶瑕佸湪鍖呰妭鐐逛笅鏂板缓锛屼笉鑳界敤鑰佺殑
List<FlowProgramFile> files = flowProgramFileService.lambdaQuery().eq(FlowProgramFile::getProcessInstanceId,pkgNode1.getProcessInstanceId()).list();
for(FlowProgramFile flowProgramFile : files){
@@ -169,7 +157,7 @@
newProgNode.setFlowProgramFileId(flowProgramFile.getId());
newProgNode.setIsCured(1);
- setGhAnnotation(flowProgramFile,machine.getMachineGroupCode(),annoDicts);
+ setGhAnnotation(flowProgramFile,machine.getControlSystem(),annoDicts);
nodeService.save(newProgNode);
}
@@ -182,7 +170,7 @@
* @param waitingCureNode 寰呭浐鍖栬妭鐐�
* @return 鍥哄寲鑺傜偣
*/
- NcNode createNewCureNodeByTargetNode(NcNode waitingCureNode){
+ NcNode createNewCureNodeByTargetNode(NcNode waitingCureNode,boolean tryPkdNodeHasProgramFiles){
//鏂板缓涓�涓妭鐐癸紝浣滀负鍥哄寲鑺傜偣锛岃�佽妭鐐逛繚鐣欎笉鍔�
NcNode cureNode = new NcNode();
BeanUtils.copyProperties(waitingCureNode, cureNode);
@@ -197,8 +185,9 @@
.eq(NcNode::getProcessEdition,waitingCureNode.getProcessEdition())
.eq(NcNode::getIsLastEdition,1).eq(NcNode::getIsCured,1).oneOpt();
- if(optOldCuredPackageNode.isEmpty()){
+ if(optOldCuredPackageNode.isEmpty() && tryPkdNodeHasProgramFiles){
//涔嬪墠 娌℃湁宸插浐鍖栫殑绋嬪簭鍖呭悕锛屽垯鐩存帴鏇存柊鐗堟湰鍙凤紝濡傛灉鏈夛紝閭ｅ氨浣跨敤node鐜板湪鐨勭増鏈彿锛屽洜涓轰笉鍙敤杞负璇曞垏锛屽鎵瑰畬鎴愬凡缁忓崌绾ersion
+ //tryPkdNodeHasProgramFiles 璇曞垏绋嬪簭鍖呬笅鏈夌▼搴忔枃浠舵墠闇�瑕佸崌绾х増鏈紙娌℃湁鏂囦欢鐨勬槸杞﹀簥锛屾棤鏂囦欢锛岀洿鎺ョ瓑寰呭洖浼狅級
cureNode.upgradeVersionNumber();
}
@@ -211,15 +200,20 @@
* @param flowProgramFile oss 鏂囦欢
*
*/
- void setGhAnnotation(FlowProgramFile flowProgramFile,String machineGroup,List<DictBiz> annoDicts) throws IOException {
+ void setGhAnnotation(FlowProgramFile flowProgramFile,String controlSystem,List<DictBiz> annoDicts) throws IOException {
String ossName = flowProgramFile.getOssName();
//
try(InputStream ins = ossTemplate.statFileStream(ossName);){
byte[] bytes = IOUtils.toByteArray(ins);
ByteArrayInputStream byteInputStream = new ByteArrayInputStream(bytes);
- InputStream finishedStream = programAnnotationService.setGHAnnotation(byteInputStream,machineGroup,annoDicts);
-
+ //InputStream finishedStream = programAnnotationService.setGHAnnotation(byteInputStream,controlSystem,annoDicts);
+ List<DictBiz> annoDictList = programAnnotationService.getAnnotionDictList();
+ AnnotationProperties annoProps = config.getConfigMap().get(controlSystem);
+ if(annoProps == null){
+ annoProps = AnnotationProperties.getDefault();
+ }
+ InputStream finishedStream =AnnotationUtil.setAnnotationAndGetInputStream(byteInputStream, "GH", annoProps.getStatusLineIndex(), controlSystem, annoDictList);
try(finishedStream) {
finishedStream.reset();
BladeFile bfile = ossTemplate.putFile(flowProgramFile.getName(), finishedStream);
@@ -230,6 +224,7 @@
}
}
}
+
/**
* 璁＄畻鏈夋晥鏈�
@@ -247,27 +242,12 @@
return DateUtil.toDate(now.plusMonths(month));
}
- /**
- * 淇濆瓨瀹℃壒瀹屾垚鐨勮褰�
- * @param packageNode
- * @param props
- */
- void addApproveTable(NcNode packageNode,FlowProgramProperties props){
- NcProgramApproved approved = new NcProgramApproved();
-
- approved.setProgramName(packageNode.getName());
- approved.setNcNodeId(packageNode.getId());//绋嬪簭鍖呰妭鐐筰d
- approved.setTitle(props.getTitle());
- approved.setProgrammerId(props.getProgrammerId());
- approvedService.save(approved);
-
- }
-
-
+ /*
void updateApproveRecordNodeId(String processInstanceId,Long nodeId){
//鏇存柊瀹℃壒璁板綍鐨刵cNodeId
approveRecordService.lambdaUpdate()
.eq(ApproveRecord::getProcessInstanceId, processInstanceId)
.set(ApproveRecord::getNcNodeId,nodeId).update();
}
+ */
}
--
Gitblit v1.9.3