diff --git a/src/main/java/com/docus/server/report/controller/ReportDownController.java b/src/main/java/com/docus/server/report/controller/ReportDownController.java index d99789a..1ba557b 100644 --- a/src/main/java/com/docus/server/report/controller/ReportDownController.java +++ b/src/main/java/com/docus/server/report/controller/ReportDownController.java @@ -3,6 +3,7 @@ package com.docus.server.report.controller; import com.alibaba.fastjson.JSONObject; import com.docus.core.util.Func; import com.docus.infrastructure.web.api.CommonResult; +import com.docus.server.report.job.ReportJob; import com.docus.server.report.service.ReportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,6 +26,24 @@ public class ReportDownController { @Resource private ReportService reportService; + @Resource + ReportJob reportJob; + @ApiOperation(value = "report lis job 测试") + @PostMapping("/lisreportJobTest") + public CommonResult LisreportJobTest(){ + reportJob.sdRyLisReportQueryJob(); + return CommonResult.success("成功"); + } + + @ApiOperation(value = "report inspect job 测试") + @PostMapping("/inspectReportJobTest") + public CommonResult inspectReportJobTest(){ + reportJob.sdRyInspectReportQueryJob(); + return CommonResult.success("成功"); + } + + + @ApiOperation(value = "根据任务id补偿报告下载") @PostMapping("/makeupReportByTaskIds") public CommonResult makeupReportByTaskIds(@RequestBody List taskIds){ @@ -42,7 +61,7 @@ public class ReportDownController { @ApiOperation(value = "inspect检查报告测试地址") - @PostMapping("/inspectTest") + @PostMapping("/inspectTest/query") public JSONObject inspectTest(@RequestParam("uuid") String uuid, @RequestParam("action") String action, @RequestParam("accessKey") String accessKey, @@ -212,7 +231,7 @@ public class ReportDownController { @ApiOperation(value = "inspect检查报告测试地址") - @PostMapping("/inspectTestNoResult") + @PostMapping("/inspectTestNoResult/query") public JSONObject inspectTestNoResult(@RequestParam("uuid") String uuid, @RequestParam("action") String action, @RequestParam("accessKey") String accessKey, @@ -241,7 +260,7 @@ public class ReportDownController { @ApiOperation(value = "lis检验报告测试地址") - @PostMapping("/lisTest") + @PostMapping("/lisTest/query") public JSONObject lisTest(@RequestParam("uuid") String uuid, @RequestParam("action") String action, @RequestParam("accessKey") String accessKey, @@ -371,7 +390,7 @@ public class ReportDownController { @ApiOperation(value = "lis检验报告测试地址") - @PostMapping("/lisTestNoResult") + @PostMapping("/lisTestNoResult/query") public JSONObject lisTestNoResult(@RequestParam("uuid") String uuid, @RequestParam("action") String action, @RequestParam("accessKey") String accessKey, diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 2e663e5..5299395 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -46,21 +46,22 @@ sdry: report-index-query: wsdl-addr: http://127.0.0.1:9311/webservice/api?wsdl namespace-uri: http://impl.webservice.collection.server.docus.com/ - operationName: pushUpdateInspectionReport + operationName: querySdJxIndexTest +# operationName: querySdJxIndexNoResultTest # 顺德人医查询检查、检验报告的地址配置 report-query-url: # lis检验报告地址 和文件分段 lis: - url: http://127.0.0.1:9311/report/makeup/lisReport + url: http://127.0.0.1:9311/report/makeup/lisTest assortId: lis - action: 1 - accessKey: 1 + action: lisac + accessKey: lisaskey # 检查报告地址 inspect: - url: http://127.0.0.1:9311/report/makeup/lisReport + url: http://127.0.0.1:9311/report/makeup/inspectTest assortId: inspect - action: 1 - accessKey: 1 + action: inspectac + accessKey: inspectaskey