增加异常流程的界面和处理

yangys

2025-08-24 4f118b548e5bc741e372fdcc035bb23f9e0ce0bb

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

@@ -10,22 +10,18 @@
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
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.commons.vo.IdsVO;
import org.springblade.core.tool.utils.UrlUtil;
import org.springblade.mdm.gkw.programnode.service.MachineFileService;
import org.springblade.mdm.machineback.service.MachineBackFileService;
import org.springblade.mdm.machineback.service.NcProgramExportInnerService;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleExcelVO;
import org.springblade.mdm.machineback.vo.MachineBackFileHandleQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileQueryVO;
import org.springblade.mdm.machineback.vo.MachineBackFileVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
@@ -40,30 +36,34 @@
public class MachineBackFileHandleController {

   private final MachineBackFileService service;
   private final MachineFileService machineFileService;
   private final NcProgramExportInnerService ncProgramExportInnerService;
   /**
    * 分页
    */
   @Operation(summary = "分页查询", description = "名称或编码")
   @Operation(summary = "分页查询", description = "名称或编码,已接受的文件列表")
   @GetMapping("/page")
   public R<IPage<MachineBackFileVO>> page(MachineBackFileHandleQueryVO query) {
      IPage<MachineBackFileVO> pages = service.handlePageQuery(query);
      IPage<MachineBackFileVO> pages = machineFileService.handlePageQuery(query);
      return R.data(pages);
   }

   @GetMapping("export-to-inner")
   @ApiOperationSupport(order = 13)
   @Operation(summary = "导出到涉密网", description = "导出到涉密网")
   public void exportToInner(@RequestBody @Parameter(description = "审批表id数组") IdsVO vo, HttpServletResponse response) {
   public void exportToInner(@Parameter(description = "审批表id数组") String ids, HttpServletResponse response) {

      if(vo.getIds() == null || vo.getIds().length == 0) {
      if(Func.isBlank(ids)) {
         throw new ServiceException("未选择文件导出");
      }
      try {
         String filename = "toinnerexp-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
         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);
         response.setContentType("application/octet-stream");
         ncProgramExportInnerService.exportToInner(vo.getIds(),response.getOutputStream());
         ncProgramExportInnerService.exportToInner(Func.toLongList(ids),response.getOutputStream());
      } catch (IOException e) {
         log.error("工控网导出回传文件异常", e);
         throw new RuntimeException(e);
@@ -76,8 +76,8 @@
   public void exportExcel(MachineBackFileHandleQueryVO query, HttpServletResponse response) {
      query.setCurrent(1);
      query.setSize(Integer.MAX_VALUE);
      IPage<MachineBackFileVO> pages = service.handlePageQuery(query);

      //IPage<MachineBackFileVO> pages = service.handlePageQuery(query);
      IPage<MachineBackFileVO> pages = machineFileService.handlePageQuery(query);
      List<MachineBackFileHandleExcelVO> list = new ArrayList<>();
      pages.getRecords().forEach(vo ->{
         MachineBackFileHandleExcelVO excelVO = new MachineBackFileHandleExcelVO();