yangys
2025-09-25 31ecdb8c700529a59dd762f0c47f0ed9c66d5092
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineAcceptedFileHandleController.java
@@ -16,12 +16,17 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.UrlUtil;
import org.springblade.mdm.commons.service.OssFileCommonService;
import org.springblade.mdm.machinefile.entity.FileSendRecord;
import org.springblade.mdm.machinefile.entity.MachineAcceptedFile;
import org.springblade.mdm.machinefile.service.MachineFileService;
import org.springblade.mdm.machinefile.service.MachineAcceptedFileService;
import org.springblade.mdm.machinefile.service.NcProgramExportInnerService;
import org.springblade.mdm.machinefile.vo.MachineBackFileHandleExcelVO;
import org.springblade.mdm.machinefile.vo.MachineAcceptedFileHandleQueryVO;
import org.springblade.mdm.machinefile.vo.MachineAcceptedFileVO;
import org.springblade.mdm.program.service.programannotation.AnnotationUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
@@ -34,7 +39,7 @@
@RequestMapping("/machinefile/filehandle")
@Tag(name = "机床回传程序处理", description = "机床回传程序处理")
public class MachineAcceptedFileHandleController {
   private final OssFileCommonService ossFileCommonService;
   private final MachineAcceptedFileService acceptedFileService;
   private final NcProgramExportInnerService ncProgramExportInnerService;
   /**
@@ -47,6 +52,13 @@
      return R.data(pages);
   }
   @GetMapping("/download-by-id")
   @Operation(summary = "下发文件记录列表", description = "下发文件记录列表")
   public void downloadByRecordId(Long id,HttpServletResponse response) throws IOException {
      MachineAcceptedFile acceptedFile = acceptedFileService.getById(id);
      ossFileCommonService.download(acceptedFile.getOssName(),acceptedFile.getName(),response);
   }
   @GetMapping("export-to-inner")
   @ApiOperationSupport(order = 13)
   @Operation(summary = "导出到涉密网", description = "导出到涉密网")
@@ -57,7 +69,6 @@
      }
      try {
         String prefix = UrlUtil.encode(AuthUtil.getNickName()+"-工控网导出");
         //String filename =AuthUtil.getNickName()+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
         String filename = prefix+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
         response.setHeader("Content-Disposition", "attachment; filename="+filename);
@@ -89,25 +100,20 @@
      ExcelUtil.export(response, "机床回传程序" + DateUtil.time(), "机床回传程序表", list, MachineBackFileHandleExcelVO.class);
   }
   String parseProgramStatusName(Integer programStatus){
   /**
    * 转换状态为显示文本
    * @param programStatus 程序状态编码
    * @return 状态名称
    */
   String parseProgramStatusName(String programStatus){
      if(programStatus == null){
         return "未知";
      }
      String txt;
      switch(programStatus){
         case 1:
            txt = "试切";
            break;
         case 2:
            txt = "固化";
            break;
         case 3:
            txt = "偏离";
            break;
         default:
            txt = "未知";
      }
      return txt;
      return switch (programStatus) {
         case AnnotationUtil.SQ -> "试切";
         case AnnotationUtil.GH -> "固化";
         case AnnotationUtil.LG -> "临时更改单";
         default -> "未知";
      };
   }
}