From 083df8d788c95c009a94378e620684eb5de2bd21 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:08:09 +0800
Subject: [PATCH] 注释问题修复

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java |   69 +++++++++++++++++++++++-----------
 1 files changed, 47 insertions(+), 22 deletions(-)

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 5d0d65d..f76b704 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
@@ -2,14 +2,23 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.mail.MessagingException;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.ws.WebServiceContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
+import org.apache.neethi.AssertionBuilderFactory;
+import org.apache.ws.commons.schema.XmlSchemaSerializer;
 import org.springblade.core.tool.api.R;
 import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.gkw.programnode.entity.MachineFile;
+import org.springblade.mdm.commons.service.InternalEmailService;
+import org.springblade.mdm.flow.service.WIthdrawService;
+import org.springblade.mdm.machinefile.entity.MachineFile;
+import org.springblade.mdm.machinefile.service.MachineFileScanService;
 import org.springblade.mdm.program.entity.NcNode;
 import org.springblade.mdm.program.service.NcNodeService;
 import org.springblade.mdm.program.service.ProgramAnnotationService;
+import org.springblade.mdm.task.InternalEmailNotifyTask;
 import org.springblade.mdm.task.MachineFileScanTask;
 import org.springblade.mdm.utils.FileContentUtil;
 import org.springblade.system.feign.IDictBizClient;
@@ -19,8 +28,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.wsdl.WSDLException;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
@@ -40,6 +49,14 @@
 	private ProgramAnnotationService programAnnotationService;
 	@Autowired
 	private IDictBizClient bizDictClient;
+	@Autowired
+	private InternalEmailService mailService;
+	@Autowired
+	private MachineFileScanService machineFileScanService;
+	@Autowired
+	private WIthdrawService withdrawService;
+	@Autowired
+	private InternalEmailNotifyTask notifyTask;
 	/**
 	 * 鏂板
 	 */
@@ -69,37 +86,45 @@
 
 	}
 
-	@GetMapping("/scan")
+	@GetMapping("/scandir")
 	@Operation(summary = "test鎵弿", description = "test鎵弿")
 	public R<Void> scan() throws IOException {
 		Machine machine = new Machine();
 		machine.setCode("M_01_FN");
 		machine.setProgReceiveDir("d:/data/machine1/rec");
-		machineFileScanTask.scanDir(machine, MachineFile.DIR_TYPE_REC);
+		machineFileScanService.scanDir(machine, MachineFile.DIR_TYPE_REC);
 		return R.success();
 	}
 
-	@GetMapping("/repalce-anno")
-	@Operation(summary = "鏇挎崲娉ㄩ噴", description = "test鎵弿")
-	public R<List<String>> repalceAnno() throws IOException {
-		InputStream res;
-		try(FileInputStream fis = new FileInputStream("d:/b.txt");) {
-			res = programAnnotationService.setSendDirAndStatusAnnotation("D:/mysend", "PL", fis,"FANUC");
-		}
-		List<String> lines = null;
-		if(res!=null) {
-			try(res) {
-				lines = IOUtils.readLines(res, "utf-8");
-			}
-		}
-		return R.data(lines);
-	}
 
 	@GetMapping("/dict-biz")
-	@Operation(summary = "鏇挎崲娉ㄩ噴", description = "test鎵弿")
+	@Operation(summary = "biz", description = "test鎵弿")
 	public R<List<DictBiz>> giz(String code) throws IOException {
-
-		return this.bizDictClient.getList(code);
+		log.info("mytset涓殑鏃ュ織");
+		return this.bizDictClient.getList	(code);
 	}
 
+	@GetMapping("/sendmail")
+	@Operation(summary = "sendmail", description = "sendmail")
+	public R<Void> sendmail(String code) throws IOException, MessagingException {
+
+		return R.success();
+	}
+
+	@GetMapping("/withdraw")
+	public R<Void> withdraw(String id) throws IOException, MessagingException {
+		withdrawService.withdraw(id);
+		return R.success();
+	}
+
+	@GetMapping("/scanfile")
+	public void scanFile(){
+		machineFileScanService.scanMachineFile();
+	}
+
+	@GetMapping("/notify")
+	public void emailNotify(){
+		SOAPException s;
+		notifyTask.execute();
+	}
 }

--
Gitblit v1.9.3