优化现场编制导出

yangys

2025-09-22 0bdfd76339bb58be09927b8c2fe268175c3a7cc8

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

@@ -13,17 +13,19 @@
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.NcProgramExportDncPageVO;
import org.springblade.mdm.program.vo.NcProgramExportDncQueryVO;
import org.springframework.web.bind.annotation.*;

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

/**
 * 程序涉密网-工控网交换接口
@@ -38,12 +40,22 @@
@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());
      }*/
      query.setUserId(AuthUtil.getUserId());
      query.setUserDeptIds(Func.toLongList(AuthUtil.getDeptId()));
      return R.data(ncProgramApprovedService.exportDncPageQuery(query));
   }