|
|
@@ -19,6 +19,7 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.amqp.rabbit.annotation.*;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import java.io.UnsupportedEncodingException;
|
|
|
@@ -49,6 +50,12 @@ public class RabbitSnapshotMessageQueueConsumer <M extends Message<String>> impl
|
|
|
@Autowired
|
|
|
protected PartyEmployeeRepository partyEmployeeRepository;
|
|
|
|
|
|
+ @Value("${runqian.server}")
|
|
|
+ protected String runqianServer;
|
|
|
+
|
|
|
+ @Value("${runqian.base-path}")
|
|
|
+ protected String runqianBasePath;
|
|
|
+
|
|
|
// @Resource
|
|
|
// private BpmInstHisRepository bpmInstHisRepository;
|
|
|
|
|
|
@@ -69,7 +76,11 @@ public class RabbitSnapshotMessageQueueConsumer <M extends Message<String>> impl
|
|
|
|
|
|
Step 2: check ti_jiao_kuai_zhao, if the value is yes, goto step 2.1, otherwise goto step 2.2
|
|
|
Step 2.1: call runQianUpload method to get generate pdf file.
|
|
|
- //https://www.szjyxt.com/ibps/platform/v3/file/upload/runQianUpload?url=https:%2F%2Fwww.szjyxt.com%2Fdemo%2FreportServlet%3Faction%3D6%26file%3D%25E9%2587%2591%25E9%2580%259A%25E5%258C%25BB%25E5%25AD%25A6%25E5%25AE%259E%25E9%25AA%258C%25E5%25AE%25A4%25E7%25AE%25A1%25E7%2590%2586%25E7%25B3%25BB%25E7%25BB%259F%252F%25E6%258A%2595%25E8%25AF%2589%252F%25E6%258A%2595%25E8%25AF%2589%25E5%25A4%2584%25E7%2590%2586%25E8%25A1%25A8.rpx%26print%3D1%26srcType%3Dfile%26paramString%3Did_%253D1166693885385113600%26org_%3D1136828146851512320&name=%E6%8A%95%E8%AF%89%E5%A4%84%E7%90%86%E8%A1%A8202310251105&type=pdf
|
|
|
+ //https://www.szjyxt.com/ibps/platform/v3/file/upload/runQianUpload?url=https:%2F%2Fwww.szjyxt.com%2Fdemo%2FreportServlet%3Faction%3D6%
|
|
|
+ 26file%3D%25E9%2587%2591%25E9%2580%259A%25E5%258C%25BB%25E5%25AD%25A6%25E5%25AE%259E%25E9%25AA%258C%25E5%25AE%25A4%25E7%25AE%25A1%25E7%2590
|
|
|
+ %2586%25E7%25B3%25BB%25E7%25BB%259F%252F%25E6%258A%2595%25E8%25AF%2589%252F%25E6%258A%2595%25E8%25AF%2589%25E5%25A4%2584%25E7%2590%2586%25E8
|
|
|
+ %25A1%25A8.rpx%26print%3D1%26srcType%3Dfile%26paramString%3Did_%253D1166693885385113600%26org_%3D1136828146851512320&name=%E6%8A%95%E8%AF%89
|
|
|
+ %E5%A4%84%E7%90%86%E8%A1%A8202310251105&type=pdf
|
|
|
//uploadFile.runQianUpload()
|
|
|
and then update table t_tsclb with field: "shi_fou_guo_shen"="已完成" "kuai_zhao_": "1166694051567632384"
|
|
|
Step 2.2: update table t_tsclb with field: "shi_fou_guo_shen"="已完成"
|
|
|
@@ -94,10 +105,11 @@ public class RabbitSnapshotMessageQueueConsumer <M extends Message<String>> impl
|
|
|
String org = entityPo.getPath().split("\\.")[0];
|
|
|
String reportPath = "金通医学实验室管理系统/" + kzMap.get("bao_biao_lu_jing_");
|
|
|
|
|
|
- String baseUrl = "https://www.szjyxt.com/demo/reportServlet?action=6&file=";
|
|
|
+ String baseUrl = runqianServer + runqianBasePath;
|
|
|
|
|
|
// 目前可用type 6:生成报表的pdf文件【默认】 7:生成报表的word文件 3:生成报表的excel文件
|
|
|
- // return `${BASE_URL}demo/reportServlet?action=${type}&file=${encodeURIComponent(reportPath + '/' + src)}&print=1&srcType=file¶mString=${getParams(where)}`
|
|
|
+ // return `${BASE_URL}demo/reportServlet?action=${type}&file=${encodeURIComponent(reportPath + '/' + src)}
|
|
|
+ // &print=1&srcType=file¶mString=${getParams(where)}`
|
|
|
|
|
|
try {
|
|
|
reportPath = URLEncoder.encode(reportPath, "UTF-8");
|
|
|
@@ -107,7 +119,7 @@ public class RabbitSnapshotMessageQueueConsumer <M extends Message<String>> impl
|
|
|
String url = baseUrl + reportPath + "&print=1&srcType=file¶mString=id_%3D" + hisMap.get("BIZ_KEY_") + "&org_=" + org;
|
|
|
|
|
|
String formattedTime = new SimpleDateFormat("yyyyMMddHHmm").format(new Date());
|
|
|
- String name = hisMap.get("PROC_DEF_NAME_") + formattedTime + "hdcs";
|
|
|
+ String name = hisMap.get("PROC_DEF_NAME_") + formattedTime ;
|
|
|
|
|
|
|
|
|
DefaultPartyUserPo user = new DefaultPartyUserPo();
|