From 254a64e2a3b773e6f743c179916db2c8c31ff140 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 18 八月 2025 19:17:17 +0800
Subject: [PATCH] 处理其他文件在固化后消失的问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/MyTestController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 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 8f4e033..5d0d65d 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
@@ -3,13 +3,17 @@
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
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.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.program.service.ProgramAnnotationService;
import org.springblade.mdm.task.MachineFileScanTask;
import org.springblade.mdm.utils.FileContentUtil;
+import org.springblade.system.feign.IDictBizClient;
+import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,6 +22,7 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
@Slf4j
@@ -31,7 +36,10 @@
@Autowired
private MachineFileScanTask machineFileScanTask;
-
+ @Autowired
+ private ProgramAnnotationService programAnnotationService;
+ @Autowired
+ private IDictBizClient bizDictClient;
/**
* 鏂板
*/
@@ -71,4 +79,27 @@
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鎵弿")
+ public R<List<DictBiz>> giz(String code) throws IOException {
+
+ return this.bizDictClient.getList(code);
+ }
+
}
--
Gitblit v1.9.3