fix: 1.user.getRoles()不能正确获取，替换为SecurityUtils.getRoles()；2.删除多余查询导出结果接口

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/pkg/WmScorePackageExportController.java

@@ -1,11 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.controller.pkg;
 
 import cn.hutool.core.collection.CollUtil;
-import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.ExportType;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmPkgDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmReportOpt;
-import com.qunzhixinxi.hnqz.admin.service.SysCommonExportService;
 import com.qunzhixinxi.hnqz.admin.service.WmScorePackageExportService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
@@ -14,7 +10,6 @@ import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,7 +30,6 @@ import java.util.List;
 public class WmScorePackageExportController {
 
 	private final WmScorePackageExportService scorePackageExportService;
-	private final SysCommonExportService commonExportService;
 
 
 	/**
@@ -70,17 +64,4 @@ public class WmScorePackageExportController {
 
 		return R.ok(scorePackageExportService.asyncExport(user, roles, startDate, endDate));
 	}
-
-	/**
-	 * 导出个人执行包信息的结果
-	 *
-	 * @return {@link WmReportOpt } 状态和结果
-	 */
-	@GetMapping("/pkg/sub-info/export-result")
-	public R<WmReportOpt> exportResult() {
-		HnqzUser user = SecurityUtils.getUser();
-		String key = String.format(CacheConstants.ASYNC_EXPORT_CACHE, ExportType.SCORE_PACKAGE_SUB.getType(), user.getId());
-
-		return R.ok(commonExportService.exportResult(user, key));
-	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/task/WmTaskExportController.java

@@ -1,11 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.controller.task;
 
 import cn.hutool.core.collection.CollUtil;
-import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.ExportType;
 import com.qunzhixinxi.hnqz.admin.api.dto.WmTaskDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmReportOpt;
-import com.qunzhixinxi.hnqz.admin.service.SysCommonExportService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskDetailExportService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
@@ -14,7 +10,6 @@ import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,7 +30,6 @@ import java.util.List;
 public class WmTaskExportController {
 
 	private final WmTaskDetailExportService taskDetailExportService;
-	private final SysCommonExportService commonExportService;
 
 
 	/**
@@ -70,17 +64,4 @@ public class WmTaskExportController {
 
 		return R.ok(taskDetailExportService.asyncExport(user, roles, startDate, endDate));
 	}
-
-	/**
-	 * 导出个人任务明细的结果
-	 *
-	 * @return {@link WmReportOpt } 状态和结果
-	 */
-	@GetMapping("/task/export/export-detail-result")
-	public R<WmReportOpt> exportResult() {
-		HnqzUser user = SecurityUtils.getUser();
-		String key = String.format(CacheConstants.ASYNC_EXPORT_CACHE, ExportType.TASK_DETAIL.getType(), user.getId());
-
-		return R.ok(commonExportService.exportResult(user, key));
-	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/user/SysUserExportController.java

@@ -1,22 +1,15 @@
 package com.qunzhixinxi.hnqz.admin.controller.user;
 
-import com.qunzhixinxi.hnqz.admin.api.constant.CacheConstants;
-import com.qunzhixinxi.hnqz.admin.api.constant.enums.ExportType;
+import cn.hutool.core.collection.CollUtil;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysUserDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmReportOpt;
 import com.qunzhixinxi.hnqz.admin.api.model.excel.SysUserExcelModel;
-import com.qunzhixinxi.hnqz.admin.service.SysCommonExportService;
-import com.qunzhixinxi.hnqz.admin.aspect.ExportGuard;
 import com.qunzhixinxi.hnqz.admin.service.SysUserExportService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
-
-import cn.hutool.core.util.ArrayUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,7 +30,6 @@ import java.util.List;
 public class SysUserExportController {
 
 	private final SysUserExportService userExportService;
-	private final SysCommonExportService commonExportService;
 
 	/**
 	 * 导出用户列表
@@ -48,22 +40,12 @@ public class SysUserExportController {
 	@PostMapping("/export-user")
 	public R<Boolean> exportUser(@RequestBody SysUserDTO.OnList query) {
 		HnqzUser user = SecurityUtils.getUser();
-		if (!ArrayUtil.contains(user.getRoles(), 50)) { // 事业部系统管理员
+		List<Integer> roles = SecurityUtils.getRoles();
+
+		if (!CollUtil.contains(roles, 50)) { // 事业部系统管理员
 			throw new RuntimeException("没有导出人员权限");
 		}
-		return R.ok(userExportService.asyncExport(user, SecurityUtils.getRoles(), query));
-	}
-
-	/**
-	 * 导出用户信息的结果
-	 *
-	 * @return {@link WmReportOpt } 状态和结果
-	 */
-	@GetMapping("/export-user-result")
-	public R<WmReportOpt> exportResult() {
-		HnqzUser user = SecurityUtils.getUser();
-		String key = String.format(CacheConstants.ASYNC_EXPORT_CACHE, ExportType.USER.getType(), user.getId());
 
-		return R.ok(commonExportService.exportResult(user, key));
+		return R.ok(userExportService.asyncExport(user, roles, query));
 	}
 }