From ad90205fe702d0238983c693a8effe255c680f27 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 17:18:44 +0800
Subject: [PATCH] 机床回传文件导出开发
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 b7adfd1..4e93910 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
@@ -11,16 +11,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.io.IOException;
-import java.util.List;
/**
* 鍏紑缃戠▼搴忚妭鐐�
@@ -42,7 +39,7 @@
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).page(Condition.getPage(query));
return R.data(pageData);
}
@@ -58,7 +55,7 @@
@Operation(summary = "淇濆瓨鏈哄簥鏂囦欢", description = "淇濆瓨鏈哄簥鏂囦欢鍒扮鐩�")
public R<Void> machineFileSave(Long id,String content) {
try {
- machineFileService.saveFileConent(id,content);
+ machineFileService.saveFileContent(id,content);
} catch (IOException e) {
log.error(e.getMessage());
return R.fail(e.getMessage());
--
Gitblit v1.9.3