From e70c88930c51c7afeb3cc2ac72fbe6fad86a942c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 16:35:25 +0800
Subject: [PATCH] 注释都是括号问题修复

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/MesSyncService.java                           |    6 +-
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java                    |   39 ++----------
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/ProcessorHelper.java     |    3 
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java             |   11 +--
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java   |   30 ++++++++++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java           |    5 +
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java |    6 ++
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java                                 |   24 ++++++++
 8 files changed, 79 insertions(+), 45 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/MesSyncService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/MesSyncService.java
index 096d5a8..9c5d81e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/MesSyncService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/MesSyncService.java
@@ -59,7 +59,7 @@
 		updateBatchById(syncList);
 	}
 
-	int postData(JSONObject bodyJson){
+	public int postData(JSONObject bodyJson){
 		HttpClient client = HttpClient.newBuilder()
 			.connectTimeout(Duration.ofSeconds(10))
 			.build();
@@ -78,8 +78,8 @@
 			HttpResponse<String> response = client.send(
 				request, HttpResponse.BodyHandlers.ofString());
 
-			System.out.println("Status Code: " + response.statusCode());
-			System.out.println("Response Body: " + response.body());
+			log.info("mes杩斿洖鐘舵�佺爜{}",response.statusCode());
+			log.info("mes杩斿洖body{}",response.body());
 
 			return response.statusCode();
 
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
index 937aca5..dbaaab2 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
@@ -11,6 +11,7 @@
 import org.springblade.mdm.machinefile.entity.FileSendRecord;
 import org.springblade.mdm.machinefile.entity.MachineFile;
 import org.springblade.mdm.program.service.ProgramAnnotationService;
+import org.springblade.mdm.program.service.ProgramOnMachineService;
 import org.springblade.mdm.program.service.programannotation.AnnotationUtil;
 import org.springblade.mdm.utils.FileContentUtil;
 import org.springblade.mdm.utils.ProgramFileNameParser;
@@ -42,7 +43,7 @@
 	@Autowired
 	private MachineService machineService;
 	@Autowired
-	private ParamService paramService;
+	private ProgramOnMachineService programOnMachineService;
 	@Autowired
 	private FileSendRecordService fileSendRecordService;
 	/**
@@ -89,7 +90,7 @@
 							FileSendRecord sendFile = optFile.get();
 							ProgramNameVO sendProgNameVO =  ProgramFileNameParser.parseProgramName(sendFile.getName());
 							if(progNameVO.getSegmentCount() != sendProgNameVO.getSegmentCount()){
-								//娈垫暟涓嶅尮閰�
+								//娈垫暟涓嶅尮閰嶄笅鍙戣褰�
 								excepType = MachineFile.EXCEPTION_NOT_MATCH_SEND;
 							}
 						}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index 62af8a0..26f6105 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -38,13 +38,11 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
-import java.lang.annotation.Annotation;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.time.Duration;
 import java.util.*;
-import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
@@ -66,7 +64,6 @@
 	private final DncBackFileService dncBackFileService;
 	private final MachineService machineService;
 	private final ParamService paramService;
-	private final MachineAnnotationConfig machineAnnotationConfig;
 
 	/**
 	 * 鍋忕鍗曟枃浠舵湯灏剧殑妯″紡锛歅+鏁板瓧
@@ -138,15 +135,7 @@
 			//鐩綍鍒楄〃锛屽嵆绋嬪簭鍖呭垪琛�
 			for(String entryName : dirEntryNameList){
 				DncSendBackData progData = new DncSendBackData();
-				String folderName = StringUtils.removeEnd(entryName,"/");
-
-				//PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
-				String packageName = folderName;//pkgAndEdition.getProgramPackageName();
-				//String processEdition = pkgAndEdition.getProcessEdition();
-				/*
-				if(StringUtils.isBlank(packageName) || StringUtils.isBlank(processEdition)){
-					throw new ServiceException("鍖呭唴鏂囦欢澶瑰悕鏍煎紡閿欒锛屽簲璇ヤ负[闆剁粍浠跺彿-宸ュ簭鍙�-宸ュ簭鐗堟]:"+folderName);
-				}*/
+				String packageName = StringUtils.removeEnd(entryName,"/");
 
 				progData.setProgramName(packageName);
 				Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(entryName)).findFirst();
@@ -162,7 +151,6 @@
 					String sendPathLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getSendPathLineIndex());//鐘舵�佹敞閲婅
 					bais.reset();
 
-
 					if(statusLine.contains("GH")){
 						//鍥哄寲锛屼笉搴斿洖浼狅紝蹇界暐
 						log.warn("鐘舵�亄},涓嶅簲鍥炰紶锛屽拷鐣�",statusLine);
@@ -174,24 +162,14 @@
 						throw new ServiceException("鏍规嵁涓嬪彂璺緞鏈壘鍒扮▼搴忓搴旂殑鏈哄簥:"+sendPathLine);
 					}
 
-					if(statusLine.contains("SQ")){
+					if(statusLine.contains(AnnotationUtil.SQ)){
 						//璇曞垏
 						programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);//TODO 杩橀渶鏍规嵁鏈哄簥缁勶紙濡備綍鑾峰彇锛熸牴鎹笅鍙戣矾寰勮幏鍙栨満搴婏紝杩涜�岃幏鍙栵級锛�,processEdition
-					}else if(statusLine.contains("PL")){
-						//鍋忕
+					}else if(statusLine.contains(AnnotationUtil.LG)){
+						//涓存椂鏇存敼鍗�
 						programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
 					}else{
-						//鏌ヨ鏄惁杞﹀簥/鐜板満缂栧埗锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊锛�
-						//TODO 鐜板満缂栧埗鐨勭▼搴忥紝鎵撳寘鏃跺繀椤诲湪鏂囦欢涓鍔犱笅鍙戣矾寰勶紙鍔犲叆鍚庯級
-						programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
-						if(programPackageNode!=null){
-							String chechuangVal = paramService.turninngValue();
-							if(StringUtils.equals(machine.getMachineSpec(),chechuangVal)){
-								//杞﹀簥
-								ProgramAnnotation pa = AnnotationUtil.getProgramAnnotationFormat(machine.getControlSystem(),annotionDictList);
-								statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);
-							}
-						}
+						throw new ServiceException("鐘舵�佹敞閲婁笉鍦ㄨ寖鍥村唴:"+statusLine+",浠呰瘯鍒囥�佷复鏃舵洿鏀瑰崟鍙互鍥炰紶");
 					}
 
 					if(programPackageNode != null) {
@@ -289,10 +267,7 @@
 			//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
 			List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
 			for(String dir : dirList){
-				String folderName = StringUtils.removeEnd(dir,"/");
-
-				//PackageAndProcessEdition pkgAndEdition = folderName;//parseProgramPackageFromFolderName(folderName);
-				String programPackageName = folderName; //pkgAndEdition.getProgramPackageName();
+				String programPackageName = StringUtils.removeEnd(dir,"/");
 
 				Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();
 
@@ -332,7 +307,7 @@
 							FlowProgramFile newFlowFile = new FlowProgramFile();
 							newFlowFile.setProgramName(packageNode.getName());
 							newFlowFile.setProcessInstanceId(null);//鍏堢疆涓虹┖锛屽惎鍔ㄦ祦绋嬪悗璁剧疆璇ュ��
-							newFlowFile.setFileType("program");
+							newFlowFile.setFileType(FlowProgramFile.TYPE_PROGRAM);
 							newFlowFile.setName(fileName);
 							InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
 							BladeFile newOssFile = ossTemplate.putFile("mdm",fileName,ins);
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 1d7f63e..366d803 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
@@ -21,10 +21,7 @@
 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.service.programannotation.AnnotationData;
-import org.springblade.mdm.program.service.programannotation.AnnotationProcessor;
-import org.springblade.mdm.program.service.programannotation.MachineAnnotationConfig;
-import org.springblade.mdm.program.service.programannotation.ProcessorHelper;
+import org.springblade.mdm.program.service.programannotation.*;
 import org.springblade.system.feign.IDictClient;
 import org.springframework.stereotype.Service;
 
@@ -108,11 +105,11 @@
 
 		FlowProgramFile programFile;
 		NcNodeHis programPackageNode = this.ncNodeHisService.getById(approved.getNcNodeId());
-		String status = "SQ";
+		String status = AnnotationUtil.SQ;
 		if(programPackageNode.isDeviationProgram()){
-			status = "PL";
+			status = AnnotationUtil.LG;
 		}else if(programPackageNode.hasCured()){
-			status = "GH";
+			status = AnnotationUtil.GH;
 		}
 		long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
 		if(packageNodeHis.isDeviationProgram()) {
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java
index 4eee91f..efe0466 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AbstractProcessor.java
@@ -18,7 +18,29 @@
 	private ProgramAnnotationService programAnnotationService;
 
 	protected AnnotationProperties annotationProperties;
+	@Override
+	public InputStream putSendPathAnnotation(String sendPath, InputStream inputStream,List<DictBiz> annoDicts) throws IOException{
+		InputStream finishedStream;
+		try(inputStream){
+			ByteArrayInputStream byteInputStream =  new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
 
+			//1鍔犲叆鍙戦�佽矾寰勭殑娉ㄩ噴
+			String sendPathAnnotation = AnnotationUtil.generateAnnotation(sendPath,getControlSystem(),annoDicts);//鍔犱簡娉ㄩ噴涔嬪悗鐨勬枃鏈�
+
+			String sendDirLine = FileContentUtil.readLineAt(byteInputStream,annotationProperties.getSendPathLineIndex());//绗�2琛屾槸鍙戦�佽矾寰�
+			byteInputStream.reset();
+
+			if(AnnotationUtil.isAnnotation(sendDirLine,getControlSystem(),annoDicts)){
+				finishedStream = FileContentUtil.replaceAtLine(byteInputStream,annotationProperties.getSendPathLineIndex(),sendPathAnnotation);
+			}else{
+				finishedStream = FileContentUtil.insertLine(byteInputStream,annotationProperties.getSendPathLineIndex(),sendPathAnnotation);
+			}
+			finishedStream.reset();
+		}
+
+		return finishedStream;
+
+	}
 	@Override
 	public InputStream putFilenameAnnotation(String fileName, InputStream inputStream) throws IOException {
 		List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
@@ -47,6 +69,7 @@
 			ByteArrayInputStream byteInputStream =  new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
 
 			//1鍔犲叆鍙戦�佽矾寰勭殑娉ㄩ噴
+			/*
 			String sendPathAnnotation = AnnotationUtil.generateAnnotation(annoData.getSendPath(),getControlSystem(),annoDicts);//鍔犱簡娉ㄩ噴涔嬪悗鐨勬枃鏈�
 
 			String sendDirLine = FileContentUtil.readLineAt(byteInputStream,annotationProperties.getSendPathLineIndex());//绗�2琛屾槸鍙戦�佽矾寰�
@@ -62,6 +85,13 @@
 			}
 
 			insAfterSetSendDir.reset();
+			*/
+
+			InputStream insAfterSetSendDir = putSendPathAnnotation(annoData.getSendPath(),byteInputStream,annoDicts);
+
+			String statusLine = FileContentUtil.readLineAt(insAfterSetSendDir,annotationProperties.getStatusLineIndex());//鐘舵�佹敞閲�
+			insAfterSetSendDir.reset();
+
 			//鍔犲叆鐘舵�佹敞閲婅
 			String statusAnnotation = AnnotationUtil.generateAnnotation(annoData.getProgramStatus(),getControlSystem(),annoDicts);//娉ㄩ噴鍚庣殑鐘舵�佹枃鏈�
 			if(AnnotationUtil.isAnnotation(statusLine,getControlSystem(),annoDicts)){
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java
index 5a1bb90..8443758 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/AnnotationProcessor.java
@@ -1,7 +1,10 @@
 package org.springblade.mdm.program.service.programannotation;
 
+import org.springblade.system.pojo.entity.DictBiz;
+
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 
 public interface AnnotationProcessor {
 
@@ -9,6 +12,9 @@
 	void setControlSystem(String controlSystemDictVal);
 	void setAnnotationProperties(AnnotationProperties annotationProperties);
 	String getControlSystem();
+
+	InputStream putSendPathAnnotation(String sendPath, InputStream inputStream, List<DictBiz> annoDicts) throws IOException;
+
 	InputStream putAnnotation(AnnotationData annoData, InputStream inputStream) throws IOException;
 
 	InputStream putFilenameAnnotation(String programName, InputStream inputStream) throws IOException;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/ProcessorHelper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/ProcessorHelper.java
index a116518..38ef9a3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/ProcessorHelper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/ProcessorHelper.java
@@ -13,11 +13,12 @@
 		if(props != null){
 			processor = SpringUtil.getBean(props.getBeanId());
 			processor.setAnnotationProperties(props);
+
 		}else{
 			processor = SpringUtil.getBean(DefaultProcessor.class);
 			processor.setAnnotationProperties(AnnotationProperties.getDefault());
 		}
-
+		processor.setControlSystem(controlSystem);
 		return processor;
 	}
 }
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
index e23d333..93139db 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java
@@ -1,5 +1,7 @@
 package org.springblade.mdm.test;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.mail.MessagingException;
@@ -10,9 +12,11 @@
 import org.apache.neethi.AssertionBuilderFactory;
 import org.apache.ws.commons.schema.XmlSchemaSerializer;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.mdm.basesetting.machine.entity.Machine;
 import org.springblade.mdm.commons.service.InternalEmailService;
+import org.springblade.mdm.flow.entity.MesSync;
 import org.springblade.mdm.flow.excution.events.CureFinishedEvent;
 import org.springblade.mdm.flow.service.MesSyncService;
 import org.springblade.mdm.flow.service.WIthdrawService;
@@ -151,4 +155,24 @@
 		SpringUtil.publishEvent(e);
 	}
 
+	@GetMapping("/call-mes")
+	public void callMess(){
+		JSONObject jsonObject = new JSONObject();
+
+		JSONArray dataList = new JSONArray();
+
+		JSONObject item = new JSONObject();
+		item.put("operationId","id1");
+		item.put("programNo","00001");
+		item.put("curedTime", DateUtil.formatDateTime(new Date()));
+
+		dataList.add(item);
+
+		jsonObject.put("batchData", dataList);
+
+		log.info("mestest data:{}",jsonObject);
+
+		int code = mesSyncService.postData(jsonObject);
+		log.info("mestest response:{}",code);
+	}
 }

--
Gitblit v1.9.3