fix: excel报告导出redis key设置错误

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

@@ -21,6 +21,7 @@ import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.common.core.entity.BaseMap;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.rabbitmq.client.RabbitMqClient;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
@@ -68,9 +69,10 @@ public class ExcelReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("excel报告导出exportNbReviewReport")
 	@GetMapping("/exportNbReviewReport")
 	public R exportNbReviewReport(WmReport wmReport) {
-
+		log.info("excel报告导出请求参数:{}", wmReport);
 
 		String key = String.format(CacheConstants.EXCEL_EXPORT_NB_REVIEW_REPORT_CACHE, wmReport.getId());
 
@@ -152,9 +154,10 @@ public class ExcelReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("excel报告导出exportNbReport")
 	@GetMapping("/exportNbReport")
 	public R exportNbReport(WmReport wmReport ) throws IOException {
-
+		log.info("excel报告导出请求参数:{}", wmReport);
 
 		String key = String.format(CacheConstants.EXCEL_EXPORT_NB_REPORT_CACHE, wmReport.getId());
 
@@ -173,7 +176,7 @@ public class ExcelReportExportController {
 		map.put("username",user.getUsername());
 		map.put("deptId",user.getDeptId());
 
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_REPORT_EXPORT_NB_QUEUE,map);
+		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_EXCEL_REPORT_EXPORT_NB_QUEUE,map);
 
 		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
 				CacheConstants.DEF_REPORT_CREATING_TTL, TimeUnit.MILLISECONDS);
@@ -245,8 +248,10 @@ public class ExcelReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("excel报告导出exportZbReviewReport")
 	@GetMapping("/exportZbReviewReport")
 	public R<?> exportZbReviewReport(WmTask wmTask) {
+		log.info("excel报告导出请求参数:{}", wmTask);
 
 		String scorePackageDrugId = wmTask.getScorePackageDrugId();
 
@@ -350,8 +355,10 @@ public class ExcelReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("excel报告导出exportZbReport")
 	@GetMapping("/exportZbReport")
 	public R exportZbReport(WmTask wmTask) throws IOException {
+		log.info("excel报告导出请求参数:{}", wmTask);
 
 		String scorePackageDrugId = wmTask.getScorePackageDrugId();
 
@@ -399,8 +406,10 @@ public class ExcelReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("excel报告导出exportNba")
 	@GetMapping("/exportNba")
 	public R<?> exportNba(WmScorePackage wmScorePackage) throws IOException {
+		log.info("excel报告导出请求参数:{}", wmScorePackage);
 
 		String key = String.format(CacheConstants.EXCEL_EXPORT_NBA_REPORT_CACHE,wmScorePackage.getId());
 
@@ -434,9 +443,10 @@ public class ExcelReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("excel报告导出exportNbaHistory")
 	@GetMapping("/exportNbaHistory")
 	public R exportNbaHistory(WmScorePackage wmScorePackage) throws IOException {
-
+		log.info("excel报告导出请求参数:{}", wmScorePackage);
 
 		String key = String.format(CacheConstants.EXCEL_EXPORT_NBA_HISTORY_REPORT_CACHE,wmScorePackage.getId());
 

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

@@ -39,6 +39,7 @@ import com.qunzhixinxi.hnqz.admin.enums.ReportEnum;
 import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.common.core.entity.BaseMap;
 import com.qunzhixinxi.hnqz.common.core.util.R;
+import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.rabbitmq.client.RabbitMqClient;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
@@ -184,9 +185,10 @@ public class ReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("报告导出exportNbReviewReport")
 	@GetMapping("/exportNbReviewReport")
 	public R exportNbReviewReport(WmReport wmReport) {
-
+		log.info("报告导出请求参数:{}", wmReport);
 
 		String key = String.format(CacheConstants.EXPORT_NB_REVIEW_REPORT_CACHE, wmReport.getId());
 
@@ -270,7 +272,7 @@ public class ReportExportController {
 	 */
 	@GetMapping("/exportNbReport")
 	public R exportNbReport(WmReport wmReport ) throws IOException {
-
+		log.info("报告导出请求参数:{}", wmReport);
 
 		String key = String.format(CacheConstants.EXPORT_NB_REPORT_CACHE, wmReport.getId());
 
@@ -452,6 +454,7 @@ public class ReportExportController {
 	 */
 	@GetMapping("/exportZbReviewReport")
 	public R<?> exportZbReviewReport(WmTask wmTask) {
+		log.info("报告导出请求参数:{}", wmTask);
 
 		String scorePackageDrugId = wmTask.getScorePackageDrugId();
 
@@ -501,6 +504,7 @@ public class ReportExportController {
 	 */
 	@GetMapping("/exportZbReport")
 	public R exportZbReport(WmTask wmTask) throws IOException {
+		log.info("报告导出请求参数:{}", wmTask);
 
 		String scorePackageDrugId = wmTask.getScorePackageDrugId();
 
@@ -547,8 +551,11 @@ public class ReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("报告导出exportHCPReport")
 	@GetMapping("/exportHCPReport")
 	public R exportHCPReport(String packageId) throws IOException {
+		log.info("报告导出请求参数:packageId={}", packageId);
+
 		if (null == packageId) {
 			return R.failed("积分包ID不能为空");
 		}
@@ -562,8 +569,11 @@ public class ReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("报告导出exportZbInfoFormWeiNew")
 	@GetMapping("/exportZbInfoFormWeiNew")
 	public R exportZbInfoFormWeiNew(WmPackageExportApiInput input) {
+		log.info("报告导出请求参数:{}", input);
+
 		String packageId=input.getId();
 		if (null == packageId) {
 			return R.failed("积分包ID不能为空");
@@ -677,8 +687,11 @@ public class ReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("报告导出exportZbInfoJs")
 	@GetMapping("/exportZbInfoJs")
 	public R exportZbInfoJs(WmTask wmTask, String exportType) throws IOException {
+		log.info("报告导出请求参数:{}", wmTask);
+
 		String packageId=wmTask.getScorePackageDrugId();
 		if (null == packageId) {
 			return R.failed("积分包ID不能为空");
@@ -752,9 +765,10 @@ public class ReportExportController {
 	 * @return
 	 * @throws IOException
 	 */
+	@SysLog("报告导出exportNbaHistory")
 	@GetMapping("/exportNbaHistory")
 	public R exportNbaHistory(WmScorePackage wmScorePackage) throws IOException {
-
+		log.info("报告导出请求参数:{}", wmScorePackage);
 
 		String key = String.format(CacheConstants.EXPORT_NBA_HISTORY_REPORT_CACHE,wmScorePackage.getId());