From 8a51795f947c991b121bf5dc4cd96523f111dfd8 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Fri, 30 Jun 2023 22:48:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=9C=E7=A8=8B=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-config/message-forward-config.json | 2 +- .../com/docus/server/AppRunBootstrap.java | 2 + .../message/api/CollectTaskService.java | 17 --------- .../api/impl/CollectTaskServiceImpl.java | 37 ------------------- .../impl/SdBusinessServiceImpl.java | 6 +-- .../dto/CompensateTasRequest.java} | 4 +- .../feign/service/CollectTaskService.java | 23 ++++++++++++ src/main/resources/bootstrap.yml | 2 +- 8 files changed, 32 insertions(+), 61 deletions(-) delete mode 100644 src/main/java/com/docus/server/message/api/CollectTaskService.java delete mode 100644 src/main/java/com/docus/server/message/api/impl/CollectTaskServiceImpl.java rename src/main/java/com/docus/server/message/{api/dto/CompensateTaskDTO.java => feign/dto/CompensateTasRequest.java} (93%) create mode 100644 src/main/java/com/docus/server/message/feign/service/CollectTaskService.java diff --git a/data-config/message-forward-config.json b/data-config/message-forward-config.json index e7e325f..c7e492b 100644 --- a/data-config/message-forward-config.json +++ b/data-config/message-forward-config.json @@ -1,7 +1,7 @@ [ { "method": "WS_RECORD_SUBMIT", - "urls": ["http://127.0.0.1:9312/message/receive/wsRecordSubmit/do22"], + "urls": ["http://127.0.0.1:9313/message/receive/wsRecordSubmit/do"], "errorResult": "1${{xpath:/Request/Msg/INHOSP_NO}}系统错误!", "messageDataType": 1 } diff --git a/src/main/java/com/docus/server/AppRunBootstrap.java b/src/main/java/com/docus/server/AppRunBootstrap.java index 02d950c..0e021b5 100644 --- a/src/main/java/com/docus/server/AppRunBootstrap.java +++ b/src/main/java/com/docus/server/AppRunBootstrap.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.scheduling.annotation.EnableAsync; import java.util.Properties; @@ -14,6 +15,7 @@ import java.util.Properties; @Slf4j @SpringBootApplication(scanBasePackages ={"com.docus"}) @MapperScan("com.docus.server.**.mapper") +@EnableFeignClients @EnableAsync public class AppRunBootstrap { public static void main(String[] args) { diff --git a/src/main/java/com/docus/server/message/api/CollectTaskService.java b/src/main/java/com/docus/server/message/api/CollectTaskService.java deleted file mode 100644 index 4f9a2b9..0000000 --- a/src/main/java/com/docus/server/message/api/CollectTaskService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.docus.server.message.api; - -import com.docus.infrastructure.web.api.CommonResult; -import com.docus.server.message.api.dto.CompensateTaskDTO; - -/** - * @author wyb - */ -public interface CollectTaskService { - - /** - *无视图采集,采集任务补偿 - * @param dto 参数 - * @return 结果 - */ - CommonResult compensateTask(CompensateTaskDTO dto); -} diff --git a/src/main/java/com/docus/server/message/api/impl/CollectTaskServiceImpl.java b/src/main/java/com/docus/server/message/api/impl/CollectTaskServiceImpl.java deleted file mode 100644 index 8e0b2f9..0000000 --- a/src/main/java/com/docus/server/message/api/impl/CollectTaskServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.docus.server.message.api.impl; - -import cn.hutool.http.HttpUtil; -import com.docus.core.util.Func; -import com.docus.infrastructure.web.api.CommonResult; -import com.docus.server.message.api.CollectTaskService; -import com.docus.server.message.api.dto.CompensateTaskDTO; -import com.docus.server.message.config.UrlConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author wyb - */ -@Service -public class CollectTaskServiceImpl implements CollectTaskService { - - private UrlConfig urlConfig; - - @Autowired - public void setUrlConfig(UrlConfig urlConfig) { - this.urlConfig = urlConfig; - } - - @Override - public CommonResult compensateTask(CompensateTaskDTO dto) { - String response = HttpUtil.post(urlConfig.getCompensateTaskUrl(), Func.toJson(dto)); - CommonResult commonResult = Func.readJson(response, CommonResult.class); - Object data = commonResult.getData(); - CommonResult result = new CommonResult<>(); - result.setCode(commonResult.getCode()); - result.setMsgCode(commonResult.getMsgCode()); - result.setMsg(commonResult.getMsg()); - result.setData(data==null?null:String.valueOf(data)); - return result; - } -} diff --git a/src/main/java/com/docus/server/message/busservice/impl/SdBusinessServiceImpl.java b/src/main/java/com/docus/server/message/busservice/impl/SdBusinessServiceImpl.java index c8f6982..6d7dda9 100644 --- a/src/main/java/com/docus/server/message/busservice/impl/SdBusinessServiceImpl.java +++ b/src/main/java/com/docus/server/message/busservice/impl/SdBusinessServiceImpl.java @@ -5,8 +5,8 @@ import com.docus.core.util.Func; import com.docus.infrastructure.core.exception.BaseException; import com.docus.infrastructure.web.api.CommonResult; import com.docus.infrastructure.web.api.ResultCode; -import com.docus.server.message.api.CollectTaskService; -import com.docus.server.message.api.dto.CompensateTaskDTO; +import com.docus.server.message.feign.service.CollectTaskService; +import com.docus.server.message.feign.dto.CompensateTasRequest; import com.docus.server.message.busservice.SdBusinessService; import com.docus.server.message.config.CollectTaskConfig; import com.docus.server.message.dto.Message; @@ -88,7 +88,7 @@ public class SdBusinessServiceImpl implements SdBusinessService { } private void compensateTask(List patientIds, List collectorIds) { - CompensateTaskDTO dto = new CompensateTaskDTO(); + CompensateTasRequest dto = new CompensateTasRequest(); dto.setPatientIds(patientIds); dto.setCollectorIds(collectorIds); dto.setPriority(4); diff --git a/src/main/java/com/docus/server/message/api/dto/CompensateTaskDTO.java b/src/main/java/com/docus/server/message/feign/dto/CompensateTasRequest.java similarity index 93% rename from src/main/java/com/docus/server/message/api/dto/CompensateTaskDTO.java rename to src/main/java/com/docus/server/message/feign/dto/CompensateTasRequest.java index fb45e17..d67ebc3 100644 --- a/src/main/java/com/docus/server/message/api/dto/CompensateTaskDTO.java +++ b/src/main/java/com/docus/server/message/feign/dto/CompensateTasRequest.java @@ -1,4 +1,4 @@ -package com.docus.server.message.api.dto; +package com.docus.server.message.feign.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -17,7 +17,7 @@ import java.util.List; */ @Data @ApiModel("任务补偿下发参数") -public class CompensateTaskDTO { +public class CompensateTasRequest { /** * 病案主键 */ diff --git a/src/main/java/com/docus/server/message/feign/service/CollectTaskService.java b/src/main/java/com/docus/server/message/feign/service/CollectTaskService.java new file mode 100644 index 0000000..5cd23b7 --- /dev/null +++ b/src/main/java/com/docus/server/message/feign/service/CollectTaskService.java @@ -0,0 +1,23 @@ +package com.docus.server.message.feign.service; + +import com.docus.infrastructure.web.api.CommonResult; +import com.docus.server.message.feign.dto.CompensateTasRequest; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +/** + * @author wyb + */ +@FeignClient(url = "${docus.url.compensate-task-url}",name = "view-collect-task") +public interface CollectTaskService { + + /** + *无视图采集,采集任务补偿 + * @param dto 参数 + * @return 结果 + */ + @RequestMapping(value = "api/NoViewCollect/compensateTask",method = RequestMethod.POST) + CommonResult compensateTask(@RequestBody CompensateTasRequest dto); +} diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index aa7bd86..b38fdb6 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -47,7 +47,7 @@ spring: docus: url: # 采集任务补偿地址 - compensate-task-url: http://localhost:9295/api/NoViewCollect/compensateTask + compensate-task-url: http://localhost:9295/ # 下载地址 down-url: http://localhost:9291/api/downplatform/report