From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 332 ++++++++++++++++++++++---------------------------------
1 files changed, 133 insertions(+), 199 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 30e65b2..72b3933 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -1,39 +1,33 @@
package org.springblade.mdm.program.service;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.alibaba.csp.sentinel.util.StringUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.mp.base.BizEntity;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.history.HistoricProcessInstance;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.tool.utils.FileUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.entity.ApproveRecord;
-import org.springblade.mdm.flow.service.ApproveRecordService;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
+import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
-import org.springblade.mdm.program.vo.DncSendBackData;
+import org.springblade.mdm.program.service.programannotation.*;
+import org.springblade.system.feign.IDictClient;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
+import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -46,204 +40,144 @@
@Service
@AllArgsConstructor
public class NcProgramExportDNCService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
- private final NcProgramService progService;
+
+ private final IDictClient dictClient;
+ private final MachineService machineService;
private final NcProgramApprovedService approvedService;
- private final ApproveRecordService approveRecordService;
private final NcNodeService ncNodeService;
+ private final NcNodeHisService ncNodeHisService;
private final OssTemplate ossTemplate;
-
- public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
- public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
- /**
- * 鍒嗛〉鏌ヨ
- * @param query 鏌ヨ鍙傛暟
- * @return
- */
- public IPage<DncSendBackData> dncSendBackPageQuery(Query query) {
-
- IPage<DncSendBackData> page = this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
-
- return page;
-
- }
-
-
+ private final FlowProgramFileService flowProgramFileService;
+ private final HistoryService historyService;
+ private final TaskDispatchService taskDispatchService;
+ private final AnnotationProcessorHelper annotationProcessorHelper;
/**
* 瀵煎嚭dnc鍘嬬缉鍖�
- * @param approvedIdArr 寰呭鍑哄鎵硅〃id鏁扮粍
+ * @param approvedIdArray 寰呭鍑哄鎵硅〃id鏁扮粍
*/
- public void exportDnc(Long[] approvedIdArr, OutputStream os) throws IOException {
+ public void exportDnc(Long[] approvedIdArray, OutputStream os) throws IOException {
//FileOutputStream fos = new FileOutputStream("d:/exportDnc.zip");
- try (ZipOutputStream zipOut = new ZipOutputStream(os);) {//os
+ try (ZipOutputStream zipOut = new ZipOutputStream(os);os) {//os
- ArrayList<Long> programIdList = new ArrayList<Long>();
-
- for (Long approvedId : approvedIdArr) {
+ for (Long approvedId : approvedIdArray) {
NcProgramApproved approved = approvedService.getById(approvedId);
- programIdList.add(approved.getNcProgramId());
+ addProgramPackageToZip(zipOut,approved);
- NcProgram prog = progService.getById(approved.getNcProgramId());
+ approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
+ approvedService.updateById(approved);
- String filename = prog.getOssName();
- InputStream inputStream = ossTemplate.statFileStream(filename);
-
- addInputStreamToZip(zipOut, inputStream, prog.getName());
-
- }
- addDataJson(zipOut, programIdList);
- }
-
- os.close();
-
- }
-
-
- /**
- * 瀵煎叆鏁版嵁鏂囦欢
- * @param zipOut
- */
- void addDataJson(ZipOutputStream zipOut, List<Long> programIdList) throws IOException {
- addProgramDataJson(zipOut, programIdList);
- addApproveRecordDataJson(zipOut, programIdList);
-
- addNcNodeDataJson(zipOut, programIdList);
- }
-
- /**
- * 瀵煎叆绋嬪簭璁板綍
- * @param zipOut
- * @param programIdList
- */
- void addProgramDataJson(ZipOutputStream zipOut, List<Long> programIdList) throws IOException {
- LambdaQueryWrapper<NcProgram> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.in(NcProgram::getId, programIdList);
- List<NcProgram> programList = progService.list(queryWrapper);
- JSONArray jsonArray = new JSONArray();
- for(NcProgram program : programList){
- JSONObject recObj = new JSONObject();
- recObj.put("id", program.getId());
- recObj.put("code", program.getCode());
- recObj.put("ossName",program.getOssName());
- recObj.put("isTextFile",program.getIsTextFile());
- recObj.put("category",program.getCategory());
- recObj.put("description",program.getDescription());
- recObj.put("name",program.getName());
- recObj.put("partNo",program.getPartNo());
- recObj.put("ncNodeId",program.getNcNodeId());
- recObj.put("bindNcNodeId",program.getBindNcNodeId());
- recObj.put("url",program.getUrl());
- recObj.put("isCured",program.getIsCured());
- recObj.put("isLocked",program.getIsLocked());
- recObj.put("isTest",program.getIsTest());
- recObj.put("machineCode",program.getMachineCode());
- recObj.put("processEdition",program.getProcessEdition());
- recObj.put("taskAssignTime",program.getTaskAssignTime());
-
- addSuperProperties(recObj,program);
-
- jsonArray.add(recObj);
- }
- addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),PROGRAM_JSON_FILE);
-
- }
-
- /**
- * 瀵煎叆瀹℃壒璁板綍
- * @param zipOut
- * @param programIdList
- */
- void addApproveRecordDataJson(ZipOutputStream zipOut, List<Long> programIdList) throws IOException {
- LambdaQueryWrapper<ApproveRecord> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.in(ApproveRecord::getNcProgramId, programIdList);
- List<ApproveRecord> records = approveRecordService.list(queryWrapper);
- JSONArray jsonArray = new JSONArray();
- for(ApproveRecord record : records){
- JSONObject recObj = new JSONObject();
- recObj.put("id", record.getId());
- recObj.put("comment", record.getComment());
- recObj.put("userId",record.getUserId());
- recObj.put("userNickname",record.getUserNickname());
- recObj.put("operateTime",record.getOperateTime());
- recObj.put("operateResult",record.getOperateResult());
- recObj.put("taskName",record.getTaskName());
- recObj.put("ncProgramId",record.getNcProgramId());
- recObj.put("processInstanceId",record.getProcessInstanceId());
-
- addSuperProperties(recObj,record);
-
- jsonArray.add(recObj);
- }
- addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),"exp_mdm_approve_record.json");
-
- }
-
- /**
- * 瀵煎叆鑺傜偣
- * @param zipOut
- * @param programIdList
- */
- void addNcNodeDataJson(ZipOutputStream zipOut, List<Long> programIdList) throws IOException {
- LambdaQueryWrapper<NcProgram> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.in(NcProgram::getId, programIdList);
-
- List<NcProgram> programs = progService.list(queryWrapper);
- JSONArray jsonArray = new JSONArray();
-
- ArrayList<Long> exportNodeIdList = new ArrayList<>();
- for(NcProgram program : programs){
- JSONObject recObj = new JSONObject();
- if(!exportNodeIdList.contains(program.getNcNodeId())){
- exportNodeIdList.add(program.getNcNodeId());
- }
- NcNode ncNode = ncNodeService.getById(program.getNcNodeId());
-
- if(StringUtils.isNotEmpty(ncNode.getParentIds())){
- List<Long> pids = Func.toLongList(ncNode.getParentIds());
- for(Long nodeId : pids){
- if(!exportNodeIdList.contains(nodeId)){
- exportNodeIdList.add(nodeId);
+ NcNodeHis pkgNodeHis = this.ncNodeHisService.getById(approved.getNcNodeId());
+ if(pkgNodeHis.isDeviationProgram()){
+ //鍋忕鍗曠殑绋嬪簭锛屽鏋滃鎵瑰鍑鸿褰曟槸瑙ｉ攣褰㈡垚鐨勶紝杩樻槸闇�瑕侀攣瀹氾紱鏅�氳瘯鍒囪繃鐨勶紝涓嶉攣瀹�
+ HistoricProcessInstance hisInst = historyService.createHistoricProcessInstanceQuery().processInstanceId(approved.getProcessInstanceId()).singleResult();
+ if(hisInst != null && hisInst.getProcessDefinitionKey().equals(FlowConstant.UNLOCK_PROCESS_KEY)){
+ NcNode pkgNode = this.ncNodeService.getById(approved.getNcNodeId());
+ if(pkgNode != null) {
+ pkgNode.lock("涓嬪彂瀵煎嚭閿佸畾");
+ ncNodeService.updateById(pkgNode);
+ }
}
}
-
}
+ }catch(Exception e){
+ Throwable [] err = e.getSuppressed();
+ throw new ServiceException("瀵煎嚭宸ユ帶缃戦敊璇�"+e.getMessage());
}
-
- LambdaQueryWrapper<NcNode> nodeQueryWrapper = new LambdaQueryWrapper<>();
- nodeQueryWrapper.in(NcNode::getId, exportNodeIdList);
- List<NcNode> nodeList =ncNodeService.list(nodeQueryWrapper);
- for(NcNode node : nodeList){
- JSONObject recObj = new JSONObject();
-
- recObj.put("id", node.getId());
- recObj.put("nodeType", node.getNodeType());
- recObj.put("machineCode",node.getMachineCode());
- recObj.put("parentId",node.getParentId());
- recObj.put("description",node.getDescription());
- recObj.put("name",node.getName());
- recObj.put("remark",node.getRemark());
- recObj.put("partNo",node.getPartNo());
- recObj.put("parentIds",node.getParentIds());
- recObj.put("processName",node.getProcessName());
-
- addSuperProperties(recObj,node);
-
- jsonArray.add(recObj);
- }
- addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),"exp_mdm_nc_node.json");
}
- void addSuperProperties(JSONObject recObj, BizEntity entity){
- recObj.put("tenantId",entity.getTenantId());
- recObj.put("createTime",entity.getCreateTime());
- recObj.put("updateTime",entity.getUpdateTime());
- recObj.put("createUser",entity.getCreateUser());
- recObj.put("updateUser",entity.getUpdateUser());
- recObj.put("status",entity.getStatus());
- recObj.put("createDept",entity.getCreateDept());
+ /**
+ * 灏嗙▼搴忓寘鍜屼笅灞炴枃浠跺姞鍏ュ帇缂╁寘
+ * @param zipOut zip鏂囦欢杈撳嚭娴�
+ * @param approved 瀹℃壒瀹屾垚璁板綍
+ */
+ private void addProgramPackageToZip(ZipOutputStream zipOut, NcProgramApproved approved) throws IOException{
+ NcNodeHis packageNodeHis = ncNodeHisService.getById(approved.getNcNodeId());
+
+ String packageFolder = packageNodeHis.getName()+"/";
+ ZipEntry zipEntry = new ZipEntry(packageFolder);// "/"缁撳熬琛ㄧず鏂囦欢澶�
+ zipOut.putNextEntry(zipEntry);
+ zipOut.closeEntry();
+
+ Machine machine = machineService.getByCode(packageNodeHis.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
+
+ //闇�瑕佸鍔犵増鏈彿鐨勮繃婊�
+ List<NcNodeHis> programNodes = ncNodeHisService.lambdaQuery().eq(NcNodeHis::getParentId, approved.getNcNodeId()).list();
+
+ FlowProgramFile programFile;
+ NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());
+ String status = AnnotationUtil.SQ;
+ if(programPackageNode.isDeviationProgram()){
+ status = AnnotationUtil.LG;
+ }else if(programPackageNode.hasCured()){
+ status = AnnotationUtil.GH;
+ }
+ long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
+ if(packageNodeHis.isDeviationProgram()) {
+ deviationSerial = taskDispatchService.getDeviationSerial(packageNodeHis.getProgramNo());
+ }
+
+ for (NcNodeHis node : programNodes) {
+ String filePathInZip = genFilePathInZip(packageFolder,node,deviationSerial);
+ programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
+ if(programFile.isProgram()) {//绋嬪簭鏂囦欢锛屾墠浼氬姞鍏ュ帇缂╁寘
+ InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
+ String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();
+
+ AnnotationProcessor annoProcessor = this.annotationProcessorHelper.getProcessor(machine.getControlSystem());
+ AnnotationData annoData = new AnnotationData();
+ annoData.setSendPath(sendDir);
+ annoData.setProgramStatus(status);
+ annoData.setDeviation(programPackageNode.getDeviation());
+ annoData.setFilename(programFile.getName());
+
+ if(StringUtils.startsWith(programPackageNode.getParentIds(),"0,4")) {
+ //璇曞垏琛ュ厖,鐗规畩鏍囪鐘舵��
+ annoData.setProgramStatus(AnnotationUtil.TMP);
+ }
+ InputStream addedInsFinal = annoProcessor.putAnnotation(annoData, inputStream);
+ addedInsFinal.reset();
+ this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);
+ }
+ }
+
}
- public void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
+ /**
+ * 鐢熸垚鍦▃ip涓殑鏂囦欢璺緞
+ * @param packageFolder zip涓殑鏂囦欢澶�
+ * @param programNode 绋嬪簭鑺傜偣
+ * @param deviationSerial 涓存椂鏇存敼鍗曞簭鍙�
+ * @return zip涓殑鏂囦欢璺緞
+ */
+ String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
+ //涓烘枃浠跺悕澧炲姞鍋忕鍗曞彿
+ String filePathInZip;
+
+ if(deviationSerial != -1){
+ //鍔犲叆鍋忕鍗曞簭鍙�
+ String ext = FilenameUtils.getExtension(programNode.getName());
+ String dotExt = StringUtils.isNotBlank(ext)?"."+ext:ext;//甯︾偣鐨勬墿灞曞悕
+
+ String temp = programNode.getName();
+ if(StringUtils.isNotBlank(ext)) {
+ temp = StringUtils.removeEnd(temp,dotExt);
+ }
+ filePathInZip = packageFolder + temp+"-P"+deviationSerial+dotExt;
+ }else{
+ //闈炲亸绂诲崟锛岀洿鎺ヤ娇鐢ㄥ師鏂囦欢鍚�
+ filePathInZip = packageFolder + programNode.getName();
+ }
+ return filePathInZip;
+ }
+ /**
+ * 灏� 杈撳叆娴� 涓殑鍐呭鍐欏叆zip
+ * @param zipOut zip杈撳嚭娴�
+ * @param inputStream 杈撳叆娴�
+ * @param entryName 鏂囦欢鍚�
+ * @throws IOException 鍐欐枃浠跺紓甯�
+ */
+ void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
throws IOException {
// 鍒涘缓鏂扮殑 ZIP 鏉＄洰
ZipEntry zipEntry = new ZipEntry(entryName);
--
Gitblit v1.9.3