From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java | 141 ++++++++++++++++++++++++++++------------------
1 files changed, 86 insertions(+), 55 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
index 96a68e1..6cd2f89 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
@@ -3,23 +3,30 @@
import com.alibaba.excel.util.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
-import org.springblade.mdm.flow.constants.FlowContants;
+import org.apache.commons.io.IOUtils;
+import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.oss.model.BladeFile;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
+import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
+import org.springblade.mdm.flow.excution.ListenerHelper;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
import org.springblade.mdm.gkw.programnode.vo.ProgramNameVO;
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.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramApprovedService;
-import org.springblade.mdm.utils.EntityUtil;
+import org.springblade.mdm.program.service.programannotation.*;
import org.springblade.mdm.utils.ProgramFileNameParser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
/**
@@ -29,43 +36,61 @@
@Component("normalDispatchFinishDataHandler")
public class NormalFinishDataHandler implements FinishDataHandler{
@Autowired
- private NcProgramApprovedService approvedService;
- @Autowired
private FlowProgramFileService flowProgramFileService;
+ @Autowired
+ private MachineAnnotationConfig annotationConfig;
+ @Autowired
+ private MachineService machineService;
@Autowired
private NcNodeService ncNodeService;
@Autowired
private NcNodeAutoCreateService ncNodeAutoCreateService;
+ @Autowired
+ private ListenerHelper listenerHelper;
+ @Autowired
+ private OssTemplate ossTemplate;
+ @Autowired
+ private NcNodeHisService ncNodeHisService;
+
/**
* DispatchFinishListener涓皟鐢�
- * @param props 鎵ц瀵硅薄
+ * @param props 娴佺▼灞炴��
*/
- public void handleData(FlowProgramProperties props) {
+ public void handleData(FlowProgramProperties props) throws IOException {
// 鎵ц涓氬姟閫昏緫
NcNode packageNode;
- if(FlowContants.Y.equals(props.getHasCuredProgram())){
+ if(FlowConstant.Y.equals(props.getHasCuredProgram())){
//鏈夊浐鍖�
packageNode = ncNodeService.getById(props.getCuredNodeId());
- if(FlowContants.N.equals(props.getCureProgramUseable())) {
- //绋嬪簭涓嶅彲鐢�
- //鍘熸潵鐨勫浐鍖栬妭鐐归攣瀹�
+ if(FlowConstant.N.equals(props.getCureProgramUseable())) {
+ //绋嬪簭涓嶅彲鐢紝鍘熸潵鐨勫浐鍖栬妭鐐归攣瀹�
packageNode.lock();
ncNodeService.updateById(packageNode);
- Integer newVersion = packageNode.genNewVersionNumber();
- packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,newVersion);
+ //鐗堟湰鍙锋牴鎹浂缁勪欢鍙�+宸ュ簭鍙凤紝宸ュ簭鐗堟锛屾満搴婄粍 鐩存帴鏌ヨ鏁伴噺锛�+1鑾峰彇
+ Integer newVersion = ncNodeHisService.calculateVersionNumber(packageNode);
+ packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props);
+ packageNode.setVersionNumber(newVersion);
+ ncNodeService.updateById(packageNode);
}else{
- //鍙敤锛屽崌鐗堬紙淇敼鍏跺伐搴忕増娆★級锛屽師鏉ョ殑鑺傜偣娓呴櫎
+ //鍙敤锛岀┖鍗囩増锛堜慨鏀瑰叾宸ュ簭鐗堟锛夛紝鍘熸潵鐨勮妭鐐规竻闄�
moveToNewProcessEdition(packageNode,props);
+ //鏇存柊宸插浐鍖栫殑锛屽悓鍚嶃�佷笉鍚屾満搴婄粍鐨勭▼搴忎负閿佸畾鐘舵��
+ ncNodeService.lockSameNameOtherMachineGroupProgramPackage(packageNode);
}
}else{
- //鏅�氳瘯鍒�
- packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,1);
+ //鏅�氳瘯鍒�/涓存椂鏇存敼鍗�
+ packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props);
+ Integer newVersion = ncNodeHisService.calculateVersionNumber(packageNode);
+ long hisSerial = ncNodeService.calculateHistorySerial(packageNode);
+ packageNode.setHisSerial(hisSerial);
+ packageNode.setVersionNumber(newVersion);
+ ncNodeService.updateById(packageNode);
}
- addApproveTable(packageNode,props);
- //updateApproveRecordNodeId(instId, packageNode.getId());
+ listenerHelper.addApproveTable(packageNode,props);
+
log.info("鏅�氭祦绋嬪凡瀹屾垚in DispatchFinishListener");
}
@@ -74,49 +99,46 @@
* @param packageNode 绋嬪簭鍖呭悕鑺傜偣
* @param props 娴佺▼灞炴��
*/
- private void moveToNewProcessEdition(NcNode packageNode, FlowProgramProperties props) {
- ncNodeService.deleteMachineNodeByParentId(packageNode.getParentId());
+ private void moveToNewProcessEdition(NcNode packageNode, FlowProgramProperties props) throws IOException {
+ //ncNodeService.deleteMachineGroupNodeByParentId();
+ ncNodeService.getBaseMapper().deleteById(packageNode.getParentId());//鍒犻櫎鏈哄簥缁勮妭鐐�
FlowProgramProperties tempProps = new FlowProgramProperties();
BeanUtils.copyProperties(props,tempProps);
- tempProps.setProcessDefinitionKey(FlowContants.CURE_PROCESS_KEY);//涓存椂淇敼鍏朵负鍥哄寲,鍦ㄥ浐鍖栦笅鍒涘缓鑺傜偣
- NcNode machineNode = ncNodeAutoCreateService.createNodeTreeToMachine(tempProps);
-
- //绉诲姩鍘嗗彶鑺傜偣鍒版柊鐨勭増娆¤妭鐐逛笅
- List<NcNode> packageHisNodes = ncNodeService.getNodeHistory(packageNode);//璇ュ寘鐨勫巻鍙茶妭鐐瑰垪琛�
- for(NcNode hisPackageNode : packageHisNodes){
- hisPackageNode.setParentId(machineNode.getParentId());
- hisPackageNode.setParentIds(machineNode.getParentIds());
-
- List<NcNode> oriProgramNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId,hisPackageNode.getId()).list();
-
- for(NcNode oldProgramNode : oriProgramNodes){
- oldProgramNode.setParentIds(hisPackageNode.getParentIds()+","+hisPackageNode.getId());
- }
- ncNodeService.updateBatchById(oriProgramNodes);
- }
- ncNodeService.updateBatchById(packageHisNodes);
+ tempProps.setProcessDefinitionKey(FlowConstant.CURE_PROCESS_KEY);//涓存椂淇敼鍏朵负鍥哄寲,鍦ㄥ浐鍖栦笅鍒涘缓鑺傜偣
+ NcNode machineGroupNode = ncNodeAutoCreateService.createNodeTreeToMachineGroup(tempProps);
//绉诲姩绋嬪簭鍖呭悕鑺傜偣
packageNode.setProcessEdition(tempProps.getProcessEdition());
- packageNode.setParentId(machineNode.getParentId());
- packageNode.setParentIds(machineNode.getParentIds());
+ packageNode.setParentId(machineGroupNode.getId());
+ packageNode.setParentIds(machineGroupNode.subNodeParentIds());
packageNode.setName(tempProps.getDrawingNo()+"-"+tempProps.getProcessNo()+"-"+tempProps.getProcessEdition());
- this.ncNodeService.updateById(packageNode);
+ this.ncNodeService.updateById(packageNode);
+ Machine machine = machineService.getByCode(packageNode.getMachineCode());
//绉诲姩绋嬪簭鑺傜偣
List<NcNode> programNodes = ncNodeService.getProgramFilesByPackageId(packageNode.getId());
for(NcNode programNode : programNodes){
+ FlowProgramFile progFile = this.flowProgramFileService.getById(programNode.getFlowProgramFileId());
- programNode.setName(buildNewFilename(programNode.getName(),tempProps.getProcessEdition()));//鍚嶇О淇敼锛屽伐搴忕増娆￠儴鍒�
- programNode.setParentIds(packageNode.getParentIds()+","+packageNode.getId());
+ programNode.setParentIds(packageNode.subNodeParentIds());
programNode.setProcessEdition(tempProps.getProcessEdition());//淇敼宸ュ簭鐗堟
programNode.setVersionNumber(packageNode.getVersionNumber());
+ if(progFile.isProgram()) {
+ programNode.setName(buildNewFilename(programNode.getName(), tempProps.getProcessEdition()));//鍚嶇О淇敼锛屽伐搴忕増娆￠儴鍒�
+ setNewProgramNameAnnotation(programNode.getName(), progFile, machine.getControlSystem());
+ }
}
ncNodeService.updateBatchById(programNodes);
}
+ /**
+ * 鏋勫缓鏂扮殑绋嬪簭甯傚悕
+ * @param filename 绋嬪簭鍖呭悕
+ * @param newProcessEdition 鏂扮殑宸ュ簭鐗堟
+ * @return 鏂扮殑绋嬪簭鏂囦欢鍚�
+ */
String buildNewFilename(String filename,String newProcessEdition){
ProgramNameVO pnameVO = ProgramFileNameParser.parseProgramName(filename);
String ext = FilenameUtils.getExtension(filename);
@@ -128,20 +150,29 @@
}
/**
- * 淇濆瓨瀹℃壒瀹屾垚鐨勮褰�
- * @param packageNode
- * @param props
+ * 璁剧疆鍥哄寲娉ㄩ噴,瀹炵幇鏂瑰紡锛岃幏鍙栨枃浠跺瓧鑺備笅锛屼慨鏀瑰悗鏇挎崲鏂囦欢
+ * @param flowProgramFile oss 鏂囦欢
+ *
*/
- void addApproveTable(NcNode packageNode,FlowProgramProperties props){
- NcProgramApproved approved = new NcProgramApproved();
+ void setNewProgramNameAnnotation(String filename,FlowProgramFile flowProgramFile, String controlSystem) throws IOException {
- approved.setProgramName(packageNode.getName());
- approved.setNcNodeId(packageNode.getId());//绋嬪簭鍖呰妭鐐筰d
- approved.setTitle(props.getTitle());
- approved.setProgrammerId(props.getActProgrammerId());
- approved.setProcessInstanceId(props.getProcessInstanceId());
- approvedService.save(approved);
+ try(InputStream ins = ossTemplate.statFileStream(flowProgramFile.getOssName());){
+ ByteArrayInputStream byteInputStream = new ByteArrayInputStream(IOUtils.toByteArray(ins));
+
+ AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(controlSystem,this.annotationConfig);
+
+ InputStream finishedStream = annoProcessor.putFilenameAnnotation(filename,byteInputStream);
+ //InputStream finishedStream = AnnotationUtil.setAnnotationAndGetInputStream(byteInputStream, "GH", annoProps.getStatusLineIndex(), controlSystem, annoDictList);
+ try(finishedStream) {
+ finishedStream.reset();
+ BladeFile bfile = ossTemplate.putFile(flowProgramFile.getName(), finishedStream);
+ //鏇挎崲鍘熸湁鐨勬枃浠跺湴鍧�
+ flowProgramFile.setOssName(bfile.getName());
+ flowProgramFile.setName(filename);
+ flowProgramFileService.updateById(flowProgramFile);
+ }
+ }
}
}
--
Gitblit v1.9.3