From c9433fab340a766a99b2c01ca018609cac407cee Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 15:17:29 +0800
Subject: [PATCH] 偏离单文件名+P1
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java
index 8c67fd9..b3813bd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java
@@ -1,6 +1,7 @@
package org.springblade.mdm.gkw.programnode.controller;
+import com.alibaba.excel.util.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,15 +12,13 @@
import org.springblade.core.tool.api.R;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
-import org.springblade.mdm.gkw.programnode.service.ProgramNodeService;
import org.springblade.mdm.gkw.programnode.vo.MachineFileQueryVO;
-import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
+import java.io.IOException;
/**
* 鍏紑缃戠▼搴忚妭鐐�
@@ -41,7 +40,9 @@
IPage<MachineFile> pageData = machineFileService.lambdaQuery()
.eq(MachineFile::getMachineCode,query.getMachineCode())
- .eq(MachineFile::getDirType,query.getDirType()).page(Condition.getPage(query));
+ .eq(MachineFile::getDirType,query.getDirType())
+ .ne(MachineFile::getStatus,MachineFile.STATUS_REMOVED).like(StringUtils.isNotBlank(query.getName()),MachineFile::getName,query.getName())
+ .page(Condition.getPage(query));
return R.data(pageData);
}
@@ -49,12 +50,19 @@
@GetMapping("/file-content")
@Operation(summary = "鑾峰彇鏈哄簥鐩綍鏂囦欢鍐呭", description = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�")
public R<String> machineFileContent(Long id) {
- return R.data("涓存椂鍐呭");
+ String content = machineFileService.getMachineFileContent(id);
+ return R.data(content);
}
@PostMapping("/file-save")
- @Operation(summary = "鑾峰彇鏂囦欢鍐呭", description = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�")
+ @Operation(summary = "淇濆瓨鏈哄簥鏂囦欢", description = "淇濆瓨鏈哄簥鏂囦欢鍒扮鐩�")
public R<Void> machineFileSave(Long id,String content) {
+ try {
+ machineFileService.saveFileContent(id,content);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ return R.fail(e.getMessage());
+ }
return R.success();
}
--
Gitblit v1.9.3