确认表增加程序编号

yangys

2025-08-29 b7af95d487f49490de16f9636147e5a40911e157

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramExportDNCController.java

@@ -9,24 +9,24 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
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.ParamService;
import org.springblade.mdm.commons.vo.IdsVO;
import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.mdm.program.service.NcProgramExportDNCService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
import org.springblade.mdm.program.vo.NcProgramExportDncPageVO;
import org.springblade.mdm.program.vo.NcProgramExportDncQueryVO;
import org.springblade.mdm.program.vo.NcProgramVO;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.server.ResponseStatusException;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;

/**
 * 程序涉密网-工控网交换接口
@@ -41,12 +41,21 @@
@Slf4j
public class NcProgramExportDNCController {

   private final NcProgramService ncProgramService;
   private final ParamService paramService;
   private final NcProgramApprovedService ncProgramApprovedService;
   private final NcProgramExportDNCService ncProgramExportDNCService;
   @Operation(summary = "程序导出DNC分页查询", description = "分页查询，供用户选择数据")
   @GetMapping("/export-dnc-page")
   public R<IPage<NcProgramExportDncPageVO>> page(NcProgramExportDncQueryVO query) {
      String userRole = AuthUtil.getUserRole();//角色别名，多个角色逗号分隔
      List<String> userRoleAliasList = Func.toStrList(",", userRole);

      String managerRole = paramService.getProgramManagerRoleAlias();
      if(!userRoleAliasList.contains(managerRole) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()){
         //非数控管理员角色、管理员，限制未只能导出自己的程序
         query.setUserId(AuthUtil.getUserId());
      }

      return R.data(ncProgramApprovedService.exportDncPageQuery(query));
   }

@@ -57,12 +66,18 @@
         throw new ServiceException("未选择文件导出");
      }
      //try {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         ncProgramExportDNCService.exportDnc(vo.getIds(),bos);
         response.getOutputStream().write(bos.toByteArray());
         String filename = "programexp-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
         response.setHeader("Content-Disposition", "attachment; filename="+filename);
         response.setContentType("application/octet-stream");
      //导出文件名称要求导出人名字+时间戳

      String uname = UrlUtil.encode(AuthUtil.getNickName());
      //String filename =AuthUtil.getNickName()+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
      String filename = uname+"-"+ DateUtil.format(DateUtil.now(), "yyyyMMddHHmm")+".zip";
      response.setHeader("Content-Disposition", "attachment; filename="+filename);
      response.setContentType("application/octet-stream;charset=utf-8");

      ByteArrayOutputStream bos = new ByteArrayOutputStream();
      ncProgramExportDNCService.exportDnc(vo.getIds(),bos);
      response.getOutputStream().write(bos.toByteArray());


      //} catch (Exception e) {
         //log.error("导出DNC异常", e);