机床修改，增加文件对比

yangys

2025-08-28 8e60278048df6d44a81ca8626cac63e5deab2761

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/machineback/controller/MachineBackFileController.java

@@ -10,19 +10,22 @@
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.vo.MachineExcelVO;
import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
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.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
@@ -32,8 +35,12 @@

   @Autowired
   private MachineBackFileService service;


   @Autowired
   private MachineFileService machineFileService;
   @Autowired
   private MachineService machineService;
   @Autowired
   private MdmDeptService mdmDeptService;
   /**
    * 接收
    */
@@ -65,10 +72,27 @@
   @Operation(summary = "分页查询", description = "名称或编码")
   @GetMapping("/page")
   public R<IPage<MachineBackFileVO>> page(MachineBackFileQueryVO query) {
      IPage<MachineBackFileVO> pages = service.pageQuery(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());
      }
      IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
      return R.data(pages);
   }

   /**
    * 分页
    */
@@ -78,7 +102,8 @@
      query.setCurrent(1);
      query.setSize(Integer.MAX_VALUE);

      IPage<MachineBackFileVO> pages = service.pageQuery(query);
      //IPage<MachineBackFileVO> pages = service.pageQuery(query);
      IPage<MachineBackFileVO> pages = machineFileService.machineBackFilePageQuery(query);
      List<MachineBackFileExcelVO> list = new ArrayList<>();
      pages.getRecords().forEach(m ->{
         MachineBackFileExcelVO excelVO = new MachineBackFileExcelVO();