Browse Source

feat: 新版报告导出-mq常量定义修改

lixuesong 1 year ago
parent
commit
c5d2b8dd03

+ 2 - 2
hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/constant/MqConstants.java

@@ -21,7 +21,6 @@ public interface MqConstants {
 	String DIRECT_MODE_REPORT_EXPORT_NB_QUEUE = "direct_mode_report_export_nb_queue";
 	String DIRECT_MODE_REPORT_EXPORT_NB_QUEUE = "direct_mode_report_export_nb_queue";
 	String DIRECT_MODE_REPORT_EXPORT_NB_REVIEW_QUEUE = "direct_mode_report_export_nb_review_queue";
 	String DIRECT_MODE_REPORT_EXPORT_NB_REVIEW_QUEUE = "direct_mode_report_export_nb_review_queue";
 
 
-	String DIRECT_MODE_NEW_DRUG_ENT_REPORT_EXPORT_QUEUE = "direct_mode_new_drug_ent_report_export_queue";
 
 
 	// excel报告导出队列
 	// excel报告导出队列
 	String DIRECT_MODE_EXCEL_REPORT_EXPORT_ZB_QUEUE = "direct_mode_excel_report_export_zb_queue";
 	String DIRECT_MODE_EXCEL_REPORT_EXPORT_ZB_QUEUE = "direct_mode_excel_report_export_zb_queue";
@@ -31,8 +30,9 @@ public interface MqConstants {
 	String DIRECT_MODE_EXCEL_REPORT_EXPORT_NB_QUEUE = "direct_mode_excel_report_export_nb_queue";
 	String DIRECT_MODE_EXCEL_REPORT_EXPORT_NB_QUEUE = "direct_mode_excel_report_export_nb_queue";
 	String DIRECT_MODE_EXCEL_REPORT_EXPORT_NB_REVIEW_QUEUE = "direct_mode_excel_report_export_nb_review_queue";
 	String DIRECT_MODE_EXCEL_REPORT_EXPORT_NB_REVIEW_QUEUE = "direct_mode_excel_report_export_nb_review_queue";
 
 
-	String DIRECT_MODE_NEW_EXCEL_DRUG_ENT_REPORT_EXPORT_QUEUE = "direct_mode_new_excel_drug_ent_report_export_queue";
+	String DIRECT_MODE_NEW_DRUG_ENT_REPORT_EXPORT_QUEUE = "direct_mode_new_drug_ent_report_export_queue";
 	String DIRECT_MODE_NEW_PERSONAL_REPORT_EXPORT_QUEUE = "direct_mode_new_personal_report_export_queue";
 	String DIRECT_MODE_NEW_PERSONAL_REPORT_EXPORT_QUEUE = "direct_mode_new_personal_report_export_queue";
+	String DIRECT_MODE_NEW_EXCEL_COMMON_REPORT_EXPORT_QUEUE = "direct_mode_new_excel_common_report_export_queue";
 
 
 	/**
 	/**
 	 * gig服务队列
 	 * gig服务队列

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

@@ -717,7 +717,7 @@ public class ReportExportController {
 		BaseMap map = new BaseMap();
 		BaseMap map = new BaseMap();
 		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
 		map.put("requestBody", JSONUtil.toJsonStr(newReportExportDTO));
 
 
-		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_EXCEL_DRUG_ENT_REPORT_EXPORT_QUEUE, map);
+		rabbitMqClient.sendMessage(MqConstants.DIRECT_MODE_NEW_EXCEL_COMMON_REPORT_EXPORT_QUEUE, map);
 
 
 		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
 		redisTemplate.opsForValue().set(key, WmReportOpt.WmReportOptStatus.GENERATING.name(),
 				CacheConstants.DEF_REPORT_CREATING_TTL , TimeUnit.MILLISECONDS);
 				CacheConstants.DEF_REPORT_CREATING_TTL , TimeUnit.MILLISECONDS);