From 79175184a6b131cef9a318ffd34529f10373c331 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 15:49:26 +0800
Subject: [PATCH] 增加已办的字段显示
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 108 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 25 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 f07b78c..fa2d695 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
@@ -14,7 +14,10 @@
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;
@@ -25,12 +28,18 @@
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.feign.ISysClient;
+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.Collections;
import java.util.List;
+import java.util.Optional;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -44,7 +53,9 @@
@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;
@@ -54,19 +65,16 @@
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";
+ 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鍘嬬缉鍖�
@@ -105,34 +113,84 @@
List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
+ NcNode programPackageNode = this.ncNodeService.getById(approved.getNcNodeId());
+ String status = "鏈浐鍖�";
+ if(programPackageNode.hasCured()){
+ status = "宸插浐鍖�";
+ }
+ List<Dict> annotationList = getAnnotionList();
for (NcNode node : programNodes) {
String filePathInZip = packageFolder + node.getName();
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
-
- /*
- 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);
- }
- zipOut.closeEntry();
-
- */
-
- this.addInputStreamToZip(zipOut,inputStream,filePathInZip);
+ Machine machine = machineService.getByCode(node.getMachineCode());
+ InputStream addedIns1 = addSendDirAnnotation(inputStream,machine,annotationList);
+ InputStream addedIns2 = addProgramStatusAnnotation(addedIns1,status,machine,annotationList);
+ this.addInputStreamToZip(zipOut,addedIns2,filePathInZip);
}
}
/**
+ * 鑾峰彇瀛楀吀涓厤缃殑娉ㄩ噴
+ * @return 瀛楀吀椤瑰垪琛�
+ */
+ List<Dict> getAnnotionList(){
+ List<Dict> annotationList;
+ R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
+ if(dictsResult.isSuccess()) {
+ annotationList = dictsResult.getData();
+ }else{
+ annotationList = Collections.emptyList();
+ }
+
+ return annotationList;
+ }
+ /**
+ * 鍔犲叆鏈哄簥涓嬪彂璺緞鍜岀▼搴忕姸鎬佺殑娉ㄩ噴
+ * @param inputStream
+ * @return
+ */
+ InputStream addSendDirAnnotation(InputStream inputStream,Machine machine,List<Dict> annotationList) throws IOException {
+ return FileContentUtil.insertLine(inputStream,1,generateAnnotation(machine.getProgSendDir(),machine.getMachineGroupCode(),annotationList));
+ }
+
+ /**
+ * 娣诲姞绋嬪簭涓撴敼鐨勬敞閲�
+ * @param inputStream
+ * @param status 绋嬪簭鐘舵��
+ * @param machine
+ * @param annotationList 閰嶇疆鐨勬敞閲婂瓧鍏稿垪琛�
+ * @return
+ * @throws IOException
+ */
+ InputStream addProgramStatusAnnotation(InputStream inputStream,String status,Machine machine,List<Dict> annotationList) throws IOException {
+ return FileContentUtil.insertLine(inputStream,2,generateAnnotation(status,machine.getMachineGroupCode(),annotationList));
+ }
+
+ String generateAnnotation(String oriTest,String machineGroupCode,List<Dict> annotationList) {
+ R<List<Dict>> dictsResult = dictClient.getList(ANNOTATION_DICT);
+ String annotation = oriTest;
+ String begin = "(";
+ String end = ")";
+
+ Optional<Dict> dictOpt = dictsResult.getData().stream().filter(dict -> {return dict.getDictKey().equals(machineGroupCode);}).findFirst();
+ String annotationSetting = "(,)";
+ if(dictOpt.isPresent()) {
+ annotationSetting = dictOpt.get().getDictValue();
+ }
+ String[] arr = annotationSetting.split(",");
+ if(arr.length == 2){
+ begin = arr[0];
+ end = arr[1];
+ }
+
+ annotation = begin + oriTest + end;
+ return annotation;
+
+ }
+ /**
* 瀵煎叆鏁版嵁鏂囦欢
* @param zipOut
*/
--
Gitblit v1.9.3