From 432198337fb3d8a99fadb4b7825771d68bb10b9e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 19:58:22 +0800
Subject: [PATCH] 去掉mail依赖
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 248 +++++++++++++++++++++----------------------------
1 files changed, 107 insertions(+), 141 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 91342ea..9fe865e 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,36 +1,40 @@
package org.springblade.mdm.program.service;
+import com.alibaba.csp.sentinel.util.StringUtil;
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 lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizEntity;
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.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
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.utils.FileContentUtil;
+import org.springblade.system.feign.IDictClient;
+import org.springblade.system.pojo.entity.Dict;
import org.springframework.stereotype.Service;
import java.io.*;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -44,65 +48,50 @@
@AllArgsConstructor
public class NcProgramExportDNCService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
- private final NcProgramService progService;
+ //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 OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
- public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
- public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
- public static final String APPROVE_RECORD_JSON_FILE = "exp_mdm_approve_record.json";
+ private final ProgramAnnotationService programAnnotationService;
+ //public static final String PROGRAM_JSON_FILE = "exp_mdm_nc_program.json";
+ //public static final String NODE_JSON_FILE = "exp_mdm_nc_node.json";
+ //public static final String APPROVE_RECORD_JSON_FILE = "exp_mdm_approve_record.json";
- /**
- * 鏄惁鍘嬬缉鍖呭唴鐨勬暟鎹枃浠�
- * @param filename 鏂囦欢鍚嶇О
- * @return
- */
- public static boolean isDataFile(String filename){
- return StringUtils.equals(filename, PROGRAM_JSON_FILE) || StringUtils.equals(filename, NODE_JSON_FILE) || StringUtils.equals(filename, APPROVE_RECORD_JSON_FILE);
- }
+ public static final String ANNOTATION_DICT = "machine_annotation";
+
/**
* 鍒嗛〉鏌ヨ
* @param query 鏌ヨ鍙傛暟
* @return
*/
public IPage<DncSendBackData> dncSendBackPageQuery(Query query) {
-
- IPage<DncSendBackData> page = this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
-
- return page;
-
+ return this.getBaseMapper().dncSendBackpageQuery(Condition.getPage(query),query);
}
-
/**
* 瀵煎嚭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> programPackageNodeIdList = new ArrayList<Long>();
-
- for (Long approvedId : approvedIdArr) {
+ for (Long approvedId : approvedIdArray) {
NcProgramApproved approved = approvedService.getById(approvedId);
- programPackageNodeIdList.add(approved.getNodeId());
-
- /*
- String filename = prog.getOssName();
- InputStream inputStream = ossTemplate.statFileStream(filename);
-
- addInputStreamToZip(zipOut, inputStream, prog.getName());
- */
addProgramPackageToZip(zipOut,approved);
+
+ approved.setStatus(NcProgramApproved.STATUS_EXPORTED);
+ approvedService.updateById(approved);
}
- addDataJson(zipOut, programPackageNodeIdList);
+
+ }catch(Exception e){
+ Throwable [] err = e.getSuppressed();
+ throw new ServiceException("瀵煎嚭宸ユ帶缃戦敊璇�"+e.getMessage());
}
-
- os.close();
-
}
/**
@@ -116,135 +105,112 @@
zipOut.putNextEntry(zipEntry);
zipOut.closeEntry();
- List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId, approved.getNodeId()).list();
+ NcNode packageNode = ncNodeService.getById(approved.getNcNodeId());
+ Machine machine = machineService.getByCode(packageNode.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
+
+ List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
+ NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());
+ String status = "SQ";
+ if(programPackageNode.isDeviationProgram()){
+ status = "PL";
+ }else if(programPackageNode.hasCured()){
+ status = "GH";
+ }
+
for (NcNode node : programNodes) {
String filePathInZip = packageFolder + node.getName();
- ZipEntry fileEntry = new ZipEntry(filePathInZip);
-
- zipOut.putNextEntry(fileEntry);
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
-
- InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
- byte[] buffer = new byte[1024];
- int length;
- while ((length = inputStream.read(buffer)) >= 0) {
- zipOut.write(buffer, 0, length);
+ if(programFile.isProgram()) {//绋嬪簭鏂囦欢锛屾墠浼氬姞鍏ュ帇缂╁寘
+ InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
+ //InputStream addedIns1 = addSendDirAnnotation(inputStream, machine, annotationList);
+ //InputStream addedIns2 = addProgramStatusAnnotation(addedIns1, status, machine, annotationList);
+ String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();
+ InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getMachineGroupCode());
+ this.addInputStreamToZip(zipOut, addedIns2, filePathInZip);
}
- zipOut.closeEntry();
}
}
+
/**
- * 瀵煎叆鏁版嵁鏂囦欢
- * @param zipOut
+ * 鍔犲叆鏈哄簥涓嬪彂璺緞鍜岀▼搴忕姸鎬佺殑娉ㄩ噴
+ * @param inputStream
+ * @return
*/
- void addDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
- //addProgramDataJson(zipOut, programPackageNodeIdList);
- addNodeDataJson(zipOut, programPackageNodeIdList);
- addApproveRecordDataJson(zipOut, programPackageNodeIdList);
- }
+ /*
+ InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
+ //妫�娴嬬浜岃鏄惁鏄矾寰�
+ String annotationText = programAnnotationService.generateAnnotation(machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList);
+ //TODO 鏀瑰垽鏂鍐呭
+ return FileContentUtil.insertLine(inputStream,1,annotationText);
+ }*/
/**
- * zip淇濋噸鍔犲叆鑺傜偣鐨勬暟鎹�
- * @param zipOut
- * @param pkgNodeIdList
+ * 娣诲姞绋嬪簭涓撴敼鐨勬敞閲�
+ * @param inputStream
+ * @param status 绋嬪簭鐘舵��
+ * @param machine
+ * @param annotationList 閰嶇疆鐨勬敞閲婂瓧鍏稿垪琛�
+ * @return
* @throws IOException
*/
- void addNodeDataJson(ZipOutputStream zipOut,List<Long> pkgNodeIdList) throws IOException {
- List<NcNode> pkgNodes = this.ncNodeService.lambdaQuery().in(NcNode::getId, pkgNodeIdList).list();
+ /*
+ InputStream addProgramStatusAnnotation(InputStream inputStream,String status,Machine machine,List<Dict> annotationList) throws IOException {
+ String annoText= programAnnotationService.generateAnnotation(status,machine.getMachineGroupCode(),annotationList);
- List<Long> allNodeIds = new ArrayList<>();
- for(NcNode node : pkgNodes){
- allNodeIds.addAll(Func.toLongList(node.getParentIds()));
- allNodeIds.add(node.getId());
- }
- //鍔犲叆绋嬪簭鍖呬笅绾х殑绋嬪簭鑺傜偣
- List<NcNode> programNodes = ncNodeService.lambdaQuery().in(NcNode::getParentId, pkgNodes.stream().map(NcNode::getId)).list();
-
- allNodeIds.addAll(programNodes.stream().map(NcNode::getId).toList());
- List<Long> distinctIds = allNodeIds.stream().distinct().toList();
- List<NcNode> allNodes = this.ncNodeService.lambdaQuery().in(NcNode::getId, distinctIds).list();
- JSONArray jsonArray = new JSONArray();
-
- for(NcNode node : allNodes){
- JSONObject recObj = getNodeJsonObject(node);
- addSuperProperties(recObj,node);
- jsonArray.add(recObj);
- }
- addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),PROGRAM_JSON_FILE);
-
- }
-
- @NotNull
- private static JSONObject getNodeJsonObject(NcNode node) {
- JSONObject recObj = new JSONObject();
- recObj.put("id", node.getId());
- recObj.put("name", node.getName());
- recObj.put("drawingNo", node.getDrawingNo());
- recObj.put("drawingNoEdition", node.getDrawingNoEdition());
- recObj.put("productModel", node.getProductModel());
- recObj.put("processName", node.getProcessName());
- recObj.put("processEdition", node.getProcessEdition());
- recObj.put("craftEdition", node.getCraftEdition());
- recObj.put("parentIds", node.getParentIds());
- recObj.put("processNo", node.getProcessNo());
-
- recObj.put("isCured", node.getIsCured());
- recObj.put("isLocked", node.getIsLocked());
- recObj.put("nodeType", node.getNodeType());
-
- recObj.put("machineCode", node.getMachineCode());
- recObj.put("flowProgramFileId", node.getFlowProgramFileId());
- return recObj;
- }
+ return FileContentUtil.insertLine(inputStream,2,annoText);
+ }*/
/**
- * 瀵煎叆瀹℃壒璁板綍
- * @param zipOut
- * @param programPackageNodeIdList 绋嬪簭鍖呭悕鐨刬d鍒楄〃
+ * 鍒ゆ柇涓�琛屾枃鏈槸鍚︽槸娉ㄩ噴
+ * @param line
+ * @param annotationList
+ * @return
*/
- void addApproveRecordDataJson(ZipOutputStream zipOut, List<Long> programPackageNodeIdList) throws IOException {
- List<String> instanceIds = this.ncNodeService.lambdaQuery().in(NcNode::getProcessInstanceId, programPackageNodeIdList)
- .list().stream().map(NcNode::getProcessInstanceId).toList();
+ /*
+ boolean isAnnotation(String line,List<Dict> annotationList){
+ boolean isAnno = false;
- List<ApproveRecord> records = approveRecordService.lambdaQuery().in(ApproveRecord::getProcessInstanceId, instanceIds).list();
+ return isAnno;
+ }*/
- 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);
+ /*
+ String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
+ R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
+ String annotation = oriTest;
+ String begin = "(";
+ String end = ")";
- jsonArray.add(recObj);
+ Optional<Dict> dictOpt = dictsResult.getData().stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
+ String annotationSetting = "(,)";
+ if(dictOpt.isPresent()) {
+ annotationSetting = dictOpt.get().getDictValue();
}
- addInputStreamToZip(zipOut,new ByteArrayInputStream(jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8)),"exp_mdm_approve_record.json");
+ String[] arr = annotationSetting.split(",");
+ if(arr.length == 2){
+ begin = arr[0];
+ end = arr[1];
+ }
+
+ annotation = begin + oriTest + end;
+ return annotation;
}
+ */
- 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());
- }
-
- public void addInputStreamToZip(ZipOutputStream zipOut, InputStream inputStream, String entryName)
+ /**
+ * 灏� 杈撳叆娴� 涓殑鍐呭鍐欏叆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