From a5f944c2bc0107e5df936937f1c33e5e03eb8fed Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 19:15:48 +0800
Subject: [PATCH] 解锁增加解锁原因和展示
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 6c9f0d1..2b415e4 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
@@ -8,7 +8,9 @@
import org.springblade.core.tool.api.R;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.service.EmailService;
-import org.springblade.mdm.gkw.programnode.entity.MachineFile;
+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;
@@ -22,7 +24,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -44,6 +45,10 @@
private IDictBizClient bizDictClient;
@Autowired
private EmailService mailService;
+ @Autowired
+ private MachineFileScanService machineFileScanService;
+ @Autowired
+ private WIthdrawService withdrawService;
/**
* 鏂板
*/
@@ -73,13 +78,13 @@
}
- @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();
}
@@ -109,9 +114,19 @@
@GetMapping("/sendmail")
@Operation(summary = "sendmail", description = "sendmail")
public R<Void> sendmail(String code) throws IOException, MessagingException {
- mailService.sendHtmlEmail("zhangxiaoxu@qianwen.ltd","testtitle"+code,"abc鐑︾儲鐑�");
- mailService.sendHtmlEmail("y_ys79@sina.com","testtitle"+code,"abc鐑︾儲鐑�");
+
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();
+ }
+
}
--
Gitblit v1.9.3