feat: 队列名

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

@@ -649,6 +649,7 @@ public class WmScorePackageController {
 			}
 
 			// 封装导出结果
+			ext.setReportMqName(CacheConstants.EXPORT_NBA_REPORT_CACHE);
 			wmScorePackageService.getReportOpt(ext);
 		}
 		return R.ok(page1);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackage.java

@@ -486,6 +486,12 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	@TableField(exist = false)
 	private WmReportOpt reportOpt;
 
+	/**
+	 * 报告队列名
+	 */
+	@TableField(exist = false)
+	private String reportMqName;
+
 	/**
 	 * 关联药品的生产厂商列表
 	 */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -93,7 +93,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 			WmReportOpt opt = new WmReportOpt();
 
 			// 获取生成记录
-			String key = String.format(CacheConstants.EXPORT_ZB_REPORT_CACHE, report.getScoreId());
+			String key = String.format(CacheConstants.EXPORT_NB_REPORT_CACHE, report.getScoreId());
 			String o = (String) redisTemplate.opsForValue().get(key);
 
 			if (StrUtil.isNotEmpty(o)) {
@@ -101,7 +101,6 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 				Long expire = redisTemplate.opsForValue().getOperations().getExpire(key, TimeUnit.SECONDS);
 				opt.setStatus(WmReportOpt.WmReportOptStatus.GENERATED);
 				opt.setTtl(LocalDateTime.now().plusSeconds(expire));
-				o = "https://pre.yaoyi.net/admin/sys-file/wmkj/兼职学术信息沟通专员业绩报告(2249)-20211116191527.doc";
 				opt.setLatestUrl(o);
 
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -274,6 +274,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
 		for (WmScorePackage scorePackage : records){
 
+			scorePackage.setReportMqName(CacheConstants.EXPORT_ZB_REPORT_CACHE);
 			this.getReportOpt(scorePackage);
 		}
 
@@ -2089,6 +2090,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		scorePackage.setStopStatus(stopStatus);
 
 		// 封装报告记录
+		scorePackage.setReportMqName(CacheConstants.EXPORT_ZB_REPORT_CACHE);
 		getReportOpt(scorePackage);
 
 		return new AsyncResult<>(scorePackage);
@@ -2244,6 +2246,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		wmScorePackage.setYsh(payScoreAndYsh.get("ysh"));
 
 		// 封装报告状态
+		wmScorePackage.setReportMqName(CacheConstants.EXPORT_NBA_REPORT_CACHE);
 		getReportOpt(wmScorePackage);
 		return wmScorePackage;
 	}
@@ -2260,7 +2263,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		WmReportOpt opt = new WmReportOpt();
 
 		// 获取生成记录
-		String key = String.format(CacheConstants.EXPORT_ZB_REPORT_CACHE, wmScorePackage.getId());
+		String key = String.format(wmScorePackage.getReportMqName(), wmScorePackage.getId());
 		String o = (String) redisTemplate.opsForValue().get(key);
 
 		if (StrUtil.isNotEmpty(o)) {