diff --git a/src/main/java/com/docus/server/collect/controller/CollectController.java b/src/main/java/com/docus/server/collect/controller/CollectController.java new file mode 100644 index 0000000..f1e7ee7 --- /dev/null +++ b/src/main/java/com/docus/server/collect/controller/CollectController.java @@ -0,0 +1,26 @@ +package com.docus.server.collect.controller; + +import com.docus.infrastructure.web.api.CommonResult; +import com.docus.server.collect.collector.LisSystemCollector; +import com.docus.server.collect.feign.api.GdSzyCollectServiceApi; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author WYBDEV + */ +@Slf4j +@RestController +@RequestMapping +public class CollectController implements GdSzyCollectServiceApi { + @Autowired + private LisSystemCollector lisSystemCollector; + + @Override + public CommonResult lisSystemCollect() { + lisSystemCollector.collect(null, null, null); + return CommonResult.success("采集完成!"); + } +} diff --git a/src/main/java/com/docus/server/collect/controller/test/TestCollectController.java b/src/main/java/com/docus/server/collect/controller/test/TestCollectController.java new file mode 100644 index 0000000..61c5c6f --- /dev/null +++ b/src/main/java/com/docus/server/collect/controller/test/TestCollectController.java @@ -0,0 +1,29 @@ +package com.docus.server.collect.controller.test; + +import com.docus.infrastructure.web.api.CommonResult; +import com.docus.server.collect.collector.LisSystemCollector; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author WYBDEV + */ +@Slf4j +@RestController +@Api(tags = "采集测试") +@RequestMapping("/collect/test/gdszy") +public class TestCollectController { + @Autowired + private LisSystemCollector lisSystemCollector; + + @ApiOperation("采集测试 LIS 采集接口") + @GetMapping("/lis") + public CommonResult lisSystemCollect() { + return CommonResult.success(lisSystemCollector.collectData(null, null, null)); + } +} diff --git a/src/main/java/com/docus/server/collect/entity/TBasic.java b/src/main/java/com/docus/server/collect/entity/TBasic.java index 4cc1092..1a7b6f9 100644 --- a/src/main/java/com/docus/server/collect/entity/TBasic.java +++ b/src/main/java/com/docus/server/collect/entity/TBasic.java @@ -1,5 +1,6 @@ package com.docus.server.collect.entity; +import com.docus.server.collect.service.dto.ReportFileInfoDTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/docus/server/collect/feign/api/GdSzyCollectServiceApi.java b/src/main/java/com/docus/server/collect/feign/api/GdSzyCollectServiceApi.java new file mode 100644 index 0000000..33840d1 --- /dev/null +++ b/src/main/java/com/docus/server/collect/feign/api/GdSzyCollectServiceApi.java @@ -0,0 +1,23 @@ +package com.docus.server.collect.feign.api; + +import com.docus.infrastructure.web.api.CommonResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * 广东省中医采集api接口 + * + * @author WYBDEV + */ +@Api(tags = "采集控制层") +@FeignClient(value = "docus-webservice-gdszy", contextId = "collect-gdszy") +public interface GdSzyCollectServiceApi { + + String PREFIX = "/collect/gdszy"; + + @ApiOperation("LIS 检验报告采集") + @GetMapping(PREFIX + "/lis") + CommonResult lisSystemCollect(); +}