From 86c8efdb19a2f4be79a947650ef62ed79382011b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 20:55:31 +0800
Subject: [PATCH] 重构机床回传文件；撤回后禁用撤回按钮
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java
index 9aff222..d786e24 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/test/OssTestController.java
@@ -16,6 +16,7 @@
import org.springblade.mdm.program.service.ProgramAnnotationService;
import org.springblade.mdm.utils.FileContentUtil;
import org.springblade.system.pojo.entity.Dict;
+import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -89,7 +90,7 @@
BladeFile bfile = ossTemplate.putFile("replaceok.txt",newins);
return R.data(bfile.getLink()+","+bfile.getName());
}
-
+ /*
@GetMapping("/replace2")
@ApiOperationSupport(order = 2)
@Operation(summary = "鏇挎崲鍐呭2")
@@ -98,7 +99,7 @@
String filename = "CP3-1-1-1.txt";
String machineGroup = "FANUC";
- List<Dict> annoDicts = programAnnotationService.getAnnotionList();
+ List<DictBiz> annoDicts = programAnnotationService.getAnnotionList();
BladeFile bfile = null;
try(InputStream ins = ossTemplate.statFileStream(ossName);){
byte[] bytes = IOUtils.toByteArray(ins);
@@ -121,14 +122,14 @@
//flowProgramFile.setOssName(bfile.getName());
}
}
- /*
+
InputStream ins = ossTemplate.statFileStream(ossName);
InputStream newins = FileContentUtil.replaceAtLine(fis,2,"GHTEST");
BladeFile bfile = ossTemplate.putFile("replaceok.txt",newins);
- */
+
return R.data(bfile.getLink()+","+bfile.getName());
}
-
+*/
}
--
Gitblit v1.9.3