From 753e2eb30a8255b43a36bfe40bb30fb9058a7ce2 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 08 九月 2025 11:23:51 +0800
Subject: [PATCH] 增加mes派工报表排序
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 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 5d0d65d..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
@@ -2,11 +2,15 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.mail.MessagingException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
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.EmailService;
+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;
@@ -20,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;
@@ -40,6 +43,12 @@
private ProgramAnnotationService programAnnotationService;
@Autowired
private IDictBizClient bizDictClient;
+ @Autowired
+ private EmailService mailService;
+ @Autowired
+ private MachineFileScanService machineFileScanService;
+ @Autowired
+ private WIthdrawService withdrawService;
/**
* 鏂板
*/
@@ -69,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();
}
@@ -96,10 +105,28 @@
}
@GetMapping("/dict-biz")
- @Operation(summary = "鏇挎崲娉ㄩ噴", description = "test鎵弿")
+ @Operation(summary = "biz", description = "test鎵弿")
public R<List<DictBiz>> giz(String code) throws IOException {
+ log.info("mytset涓殑鏃ュ織");
+ return this.bizDictClient.getList (code);
+ }
- 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();
}
}
--
Gitblit v1.9.3