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/machinefile/controller/MachineCollectFileController.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
similarity index 67%
rename from blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
rename to blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
index f75af94..e6accdd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
@@ -1,40 +1,32 @@
-package org.springblade.mdm.machineback.controller;
+package org.springblade.mdm.machinefile.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
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.service.MachineFileService;
-import org.springblade.mdm.machineback.service.MachineBackFileService;
-import org.springblade.mdm.machineback.vo.MachineBackFileExcelVO;
-import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
-import org.springblade.mdm.machineback.vo.MachineBackFileVO;
-import org.springblade.system.pojo.entity.Dept;
-import org.springframework.beans.BeanUtils;
+import org.springblade.mdm.machinefile.entity.MachineFile;
+import org.springblade.mdm.machinefile.service.MachineAcceptedFileService;
+import org.springblade.mdm.machinefile.service.MachineFileService;
+import org.springblade.mdm.machinefile.vo.MachineBackFileQueryVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
@Slf4j
@RestController
-@RequestMapping("/machineback/file")
+@RequestMapping("/machinefile/collect")
@Tag(name = "鏈哄簥鍥炰紶鏂囦欢", description = "鏈哄簥鍥炰紶鏂囦欢")
-public class MachineBackFileController {
+public class MachineCollectFileController {
@Autowired
- private MachineBackFileService service;
+ private MachineAcceptedFileService service;
@Autowired
private MachineFileService machineFileService;
@Autowired
@@ -45,17 +37,34 @@
* 鎺ユ敹
*/
@Operation(summary = "鎺ユ敹", description = "鎺ユ敹鏂囦欢")
- @PostMapping("/accept")
+ @PostMapping("/temp-accept")
public R<Void> accept(@RequestParam String ids) {
- service.accept(ids);
- return R.success();
+ try {
+ service.accept(ids);
+ return R.success();
+ }catch(Exception e) {
+ log.error("鎺ュ彈鏂囦欢寮傚父",e);
+ return R.fail(e.getMessage());
+ }
+ }
+
+ @Operation(summary = "鎵归噺鎺ユ敹", description = "鎺ユ敹鎵�鏈夋枃浠�")
+ @PostMapping("/temp-accept-all")
+ public R<Void> acceptAll() {
+ try {
+ service.acceptAll();
+ return R.success();
+ }catch(Exception e) {
+ log.error("鎺ュ彈鏂囦欢寮傚父",e);
+ return R.fail(e.getMessage());
+ }
}
/**
*鎷掔粷锛屽氨鏄垹闄�
*/
@Operation(summary = "鎷掔粷", description = "鎷掔粷")
- @PostMapping("/reject")
+ @PostMapping("/temp-reject")
public R<Void> reject(@RequestParam String ids) {
try {
service.reject(ids);
@@ -69,9 +78,9 @@
/**
* 鍒嗛〉
*/
- @Operation(summary = "鍒嗛〉鏌ヨ", description = "鍚嶇О鎴栫紪鐮�")
- @GetMapping("/page")
- public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {
+ @Operation(summary = "鏈哄簥鏂囦欢TEMP鐩綍鍒嗛〉鏌ヨ", description = "鍑荤┛鏂囦欢鍒嗛〉鏌ヨ锛屾煡璇㈢洰褰曚腑鐨勬枃浠讹紝杩樹笉绠楁椂鏈哄簥鍥炰紶鏂囦欢")
+ @GetMapping("/file-page-for-acceept")
+ public R<IPage<MachineFile>> filePageForAccept(MachineBackFileQueryVO query) {
List<Long> deptIds = new ArrayList<>();
if("workshop".equals(query.getNodeType()) || "seg".equals(query.getNodeType())) {
//鑺傜偣涓鸿溅闂淬�佸伐娈�
@@ -90,12 +99,13 @@
}else if("dir".equals(query.getNodeType())){
query.setMachineCode(query.getMachineCode());
}
- IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
+ IPage<MachineFile> pages = machineFileService.filePageForAccept(query);
return R.data(pages);
}
/**
* 鍒嗛〉
*/
+ /*
@Operation(summary = "瀵煎嚭Excel", description = "瀵煎嚭Excel")
@GetMapping("/export-excel")
public void exportExcel(MachineBackFileQueryVO query, HttpServletResponse response) {
@@ -103,14 +113,13 @@
query.setSize(Integer.MAX_VALUE);
//IPage<MachineBackFileVO> pages = service.pageQuery(query);
- IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
+ IPage<MachineFile> pages = machineFileService.filePageForAccept(query);
List<MachineBackFileExcelVO> list = new ArrayList<>();
pages.getRecords().forEach(m ->{
MachineBackFileExcelVO excelVO = new MachineBackFileExcelVO();
BeanUtils.copyProperties(m, excelVO);
- excelVO.setCureStatus(m.getIsCured()==1?"宸插浐鍖�":"鏈浐鍖�");
list.add(excelVO);
});
ExcelUtil.export(response, "鏈哄簥鍥炰紶鏂囦欢" + DateUtil.time(), "鏈哄簥鍥炰紶鏂囦欢琛�", list, MachineBackFileExcelVO.class);
- }
+ }*/
}
--
Gitblit v1.9.3