Просмотр исходного кода

功能增强: 把控制生成快照的功能移到后台运行

szjbdgzl 2 лет назад
Родитель
Сommit
279c9263c4

+ 0 - 10
ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/listener/ProcEndEventListener.java

@@ -171,16 +171,6 @@ public class ProcEndEventListener implements ApplicationListener<ProcEndEvent>,O
 		Map<String, Object> var = new HashMap<>();
 		var.put("userId",ContextUtil.getCurrentUserId());
 		var.put("instId",instId);
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		String scheme = request.getScheme();
-		System.out.println("scheme = " + scheme);
-		//获取域名
-		String serverName = request.getServerName();
-		System.out.println("serverName = " + serverName);
-		//组装成基础url
-		String basePath = scheme + "://" + request.getServerName() + "/";
-		System.out.println("basePath = " + basePath);
-		var.put("basePath", basePath);
 		MessageQueueProductorUtil.send(buildSnapshotMessage(var));
 		return instance;
 	}

+ 6 - 8
ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/mq/consumer/rabbit/RabbitSnapshotMessageQueueConsumer.java

@@ -105,8 +105,7 @@ public class RabbitSnapshotMessageQueueConsumer <M extends Message<String>> impl
                 String org = entityPo.getPath().split("\\.")[0];
                 String reportPath = "金通医学实验室管理系统/" + kzMap.get("bao_biao_lu_jing_");
 
-                String baseUrl = runqianServer + runqianBasePath;
-
+                String baseUrl = runqianServer + runqianBasePath + "/reportServlet?action=6&file=";
                 //  目前可用type    6:生成报表的pdf文件【默认】   7:生成报表的word文件   3:生成报表的excel文件
                 //            return `${BASE_URL}demo/reportServlet?action=${type}&file=${encodeURIComponent(reportPath + '/' + src)}
                 //            &print=1&srcType=file&paramString=${getParams(where)}`
@@ -132,14 +131,13 @@ public class RabbitSnapshotMessageQueueConsumer <M extends Message<String>> impl
 
             }
             StringBuilder sql = new StringBuilder();
-            if (BeanUtils.isNotEmpty(kzMap)){
+            if (BeanUtils.isNotEmpty(kzMap)) {
                 sql.append("update t_").append(kzMap.get("tablekey_")).append(" set shi_fou_guo_shen_ = '已完成' ");
+                if (result.getState() == 200 && BeanUtils.isNotEmpty(result.getData())) {
+                    sql.append(" , kuai_zhao_ = '").append(result.getData().getId()).append("' ");
+                }
+                sql.append(" where id_ = '").append(hisMap.get("BIZ_KEY_")).append("' ");
             }
-            if (result.getState() == 200 && BeanUtils.isNotEmpty(result.getData())){
-                sql.append(" , kuai_zhao_ = '").append(result.getData().getId()).append("' ");
-            }
-            sql.append(" where id_ = '").append(hisMap.get("BIZ_KEY_")).append("' ");
-
             commonDao.execute(sql.toString());
 
         }