From f76ac44a47aaddcf2f8c6b4a83375acdb0e1c1ed Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 27 八月 2025 13:59:05 +0800
Subject: [PATCH] 增加文件修改历史
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java | 19 ++++++++++++++-----
1 files changed, 14 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..3aec2b2 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;
@@ -10,17 +11,17 @@
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.mdm.gkw.programnode.entity.MachineFile;
+import org.springblade.mdm.gkw.programnode.service.MachineFileChangeHisService;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
-import org.springblade.mdm.gkw.programnode.service.ProgramNodeService;
+import org.springblade.mdm.gkw.programnode.vo.MachineFileChangeHisQueryVO;
+import org.springblade.mdm.gkw.programnode.vo.MachineFileChangeHisVO;
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;
/**
* 鍏紑缃戠▼搴忚妭鐐�
@@ -35,6 +36,7 @@
@Slf4j
public class MachineFileController {
private final MachineFileService machineFileService;
+ private final MachineFileChangeHisService machineFileChangeHisService;
@GetMapping("/file-page")
@Operation(summary = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�", description = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�")
@@ -42,7 +44,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);
}
@@ -58,7 +62,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());
@@ -66,4 +70,9 @@
return R.success();
}
+ @GetMapping("/file-his-page")
+ @Operation(summary = "淇敼鐣欏巻鍙插垪琛�", description = "淇敼鐣欏巻鍙插垪琛�")
+ public R<IPage<MachineFileChangeHisVO>> changeHisPage(MachineFileChangeHisQueryVO query) {
+ return R.data(machineFileChangeHisService.pageQuery(query));
+ }
}
--
Gitblit v1.9.3