From 8e60278048df6d44a81ca8626cac63e5deab2761 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 28 八月 2025 15:10:05 +0800
Subject: [PATCH] 机床修改，增加文件对比
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/MachineFileController.java | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 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..c474cce 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;
@@ -9,17 +10,25 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
+import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.producedivision.entity.MdmDept;
+import org.springblade.mdm.basesetting.producedivision.service.MdmDeptService;
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.springblade.mdm.program.vo.CompareDataVO;
+import org.springframework.beans.factory.annotation.Autowired;
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.ArrayList;
import java.util.List;
/**
@@ -30,20 +39,47 @@
@NonDS
@RestController
@RequestMapping("/gkw/node")
-@AllArgsConstructor
@Tag(name = "宸ユ帶缃戠▼搴忚妭鐐�", description = "宸ユ帶缃戠▼搴忚妭鐐�")
@Slf4j
public class MachineFileController {
- private final MachineFileService machineFileService;
+ @Autowired
+ private MachineFileService machineFileService;
+ @Autowired
+ private MachineFileChangeHisService machineFileChangeHisService;
+ @Autowired
+ private MdmDeptService mdmDeptService;
+ @Autowired
+ private MachineService machineService;
@GetMapping("/file-page")
@Operation(summary = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�", description = "宸ユ帶缃戠洰褰曟枃浠跺垪琛�")
public R<IPage<MachineFile>> page(MachineFileQueryVO query) {
-
+ /*
IPage<MachineFile> pageData = machineFileService.lambdaQuery()
.eq(MachineFile::getMachineCode,query.getMachineCode())
- .eq(MachineFile::getDirType,query.getDirType()).page(Condition.getPage(query));
- return R.data(pageData);
+ .eq(MachineFile::getDirType,query.getDirType())
+ .ne(MachineFile::getStatus,MachineFile.STATUS_REMOVED).like(StringUtils.isNotBlank(query.getName()),MachineFile::getName,query.getName())
+ .page(Condition.getPage(query));
+ */
+ List<Long> deptIds = new ArrayList<>();
+ if("workshop".equals(query.getNodeType()) || "seg".equals(query.getNodeType())) {
+ //鑺傜偣涓鸿溅闂淬�佸伐娈�
+ MdmDept dept = mdmDeptService.getById(query.getNodeId());
+
+ String idStr = dept.getAncestors()+","+dept.getId();
+ List<MdmDept> depts = mdmDeptService.lambdaQuery().likeRight(MdmDept::getParentId, query.getNodeId()).list();
+ deptIds.addAll(depts.stream().map(MdmDept::getId).toList());
+ deptIds.add(dept.getId());
+ //+鏈溅闂�
+ //Func.toStrList(",",idStr)
+ query.setDeptIds(deptIds);
+ }else if("machine".equals(query.getNodeType())){
+ Machine machine = machineService.getById(query.getNodeId());
+ query.setMachineCode(machine.getCode());
+ }else if("dir".equals(query.getNodeType())){
+ query.setMachineCode(query.getMachineCode());
+ }
+ return R.data(machineFileService.pageQuery(query));
}
@@ -58,7 +94,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 +102,22 @@
return R.success();
}
+ @GetMapping("/file-his-page")
+ @Operation(summary = "淇敼鐣欏巻鍙插垪琛�", description = "淇敼鐣欏巻鍙插垪琛�")
+ public R<IPage<MachineFileChangeHisVO>> changeHisPage(MachineFileChangeHisQueryVO query) {
+ return R.data(machineFileChangeHisService.pageQuery(query));
+ }
+
+ @GetMapping("/his-compare")
+ @Operation(summary = "瀵规瘮鍘嗗彶鏂囦欢鍐呭", description = "瀵规瘮鍘嗗彶鏂囦欢鍐呭")
+ public R<CompareDataVO> machineFileSave(Long id) {
+ try {
+ CompareDataVO vo =machineFileService.queryHisContentForCompare(id);
+ return R.data(vo);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ return R.fail(e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.9.3