重构机床回传文件；撤回后禁用撤回按钮

yangys

2025-08-30 86c8efdb19a2f4be79a947650ef62ed79382011b

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java

ÎļþÃû´Ó blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.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) {
      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);
   }
   }*/
}