From 7cbce8eab1af3957f67cf77c8235befc1e02b515 Mon Sep 17 00:00:00 2001 From: linrf Date: Thu, 8 Jun 2023 15:53:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/docus/server/CxfConfig.java | 2 +- .../basic/http/HttpBasicResultImpl.java | 7 +- .../basic/http/HttpTBasicCollectorImpl.java | 4 +- .../basic/http/HttpTBasicConverter.java | 8 +- .../basic/ws/WsBasicCollectorImpl.java | 2 +- .../collect/basic/ws/WsBasicResultImpl.java | 8 +- .../collect/basic/ws/WsTBasicConverter.java | 8 +- .../dept/http/HttpDeptCollectorImpl.java | 2 +- .../collect/dept/http/HttpDeptConverter.java | 2 +- .../collect/dept/http/HttpDeptResultImpl.java | 2 +- .../collect/dept/mq/JmsIbmListener.java | 3 +- .../collect/dept/mq/MqDeptConverter.java | 2 +- .../collect/dept/mq/MqDeptResultImpl.java | 2 +- .../collect/dept/ws/WsDeptCollectorImpl.java | 2 +- .../collect/dept/ws/WsDeptConverter.java | 2 +- .../collect/dept/ws/WsDeptResultImpl.java | 4 +- .../medical/record/ParseServiceImpl.java | 127 ------------------ .../collect/report/ReportConverter.java | 6 +- .../collect/report/WsReportResultImpl.java | 2 +- .../user/http/HttpUserCollectorImpl.java | 2 +- .../collect/user/http/HttpUserConverter.java | 2 +- .../collect/user/http/HttpUserResultImpl.java | 2 +- .../collect/user/mq/MqUserConverter.java | 2 +- .../collect/user/mq/MqUserResultImpl.java | 2 +- .../collect/user/ws/WsUserCollectorImpl.java | 2 +- .../collect/user/ws/WsUserConverter.java | 2 +- .../collect/user/ws/WsUserResultImpl.java | 4 +- collect-sdry/src/main/resources/bootstrap.yml | 16 +-- collect-sdry/src/main/resources/logback.xml | 6 +- .../collect/{service => }/ICollector.java | 2 +- .../{ws/convert => collect}/IConverter.java | 2 +- .../collect/{service => }/IHttpCollector.java | 2 +- .../server/{ws => collect}/IHttpResult.java | 2 +- .../docus/server/collect/{job => }/IJob.java | 6 +- .../server/{ws => collect}/IMqResult.java | 2 +- .../docus/server/{ws => collect}/IResult.java | 2 +- .../{ws => collect}/IWebServiceServer.java | 16 +-- .../collect/{service => }/IWsCollector.java | 2 +- .../server/{ws => collect}/IWsResult.java | 2 +- .../http/BasicRestController.java} | 15 ++- .../http}/TBasicHttpCollectJob.java | 13 +- .../{controller => basic/mq}/Test.java | 2 +- .../view}/TBasicViewCollectJob.java | 11 +- .../{ => collect/basic}/ws/IBasicServer.java | 2 +- .../ws}/TBasicWsCollectJob.java | 21 +-- .../basic}/ws/impl/BasicServerImpl.java | 15 ++- .../http}/DeptHttpCollectJob.java | 13 +- .../http/DeptRestController.java} | 17 ++- .../{ => dept}/mq/IDeptMqCollectService.java | 2 +- .../mq/impl}/DeptMqCollectServiceImpl.java | 8 +- .../view}/DeptViewCollectJob.java | 11 +- .../dept => dept/ws}/DeptWsCollectJob.java | 21 +-- .../{ => collect/dept}/ws/IDeptServer.java | 2 +- .../dept}/ws/impl/DeptServerImpl.java | 17 ++- .../event/TaskConsumptionReportDownEvent.java | 2 +- .../event/ThreePartyPushReportDownEvent.java | 2 +- .../report}/listener/ReportDownListener.java | 6 +- .../report/service}/IReportService.java | 2 +- .../service}/impl/ReportServiceImpl.java | 8 +- .../report}/ws/IReportServer.java | 2 +- .../report}/ws/impl/ReportServerImpl.java | 17 ++- .../server/collect/service/IParseService.java | 14 -- .../http}/UserHttpCollectJob.java | 13 +- .../http/UserRestController.java} | 17 ++- .../{ => user}/mq/IUserMqCollectService.java | 2 +- .../mq/impl}/UserMqCollectServiceImpl.java | 8 +- .../view}/UserViewCollectJob.java | 11 +- .../{ => collect/user}/ws/IUserServer.java | 2 +- .../user => user/ws}/UserWsCollectJob.java | 13 +- .../user}/ws/impl/UserServerImpl.java | 21 +-- .../convert/TaskOriginalMessageConverter.java | 8 +- .../pojo => web}/domain/TaskConfig.java | 6 +- .../dao => web/enums}/CollectTypeEnum.java | 4 +- .../enums/EnumItemView.java | 2 +- .../enums/EnumTypeHandlerDispatch.java | 2 +- .../dao => web/enums}/FlagEnum.java | 4 +- .../enums/IIntegerEnum.java | 2 +- .../enums/IntegerEnumHandler.java | 2 +- .../enums}/ReceiveDeptInfoEntity.java | 2 +- .../dao => web/enums}/StateEnum.java | 4 +- .../enums}/TaskOriginalMessage.java | 2 +- .../{ => web}/job/AbstractCollectJob.java | 9 +- .../mapper/ReceiveDeptInfoMapper.java | 4 +- .../mapper/TaskConfigMapper.java | 4 +- .../mapper/TaskOriginalMessageMapper.java | 4 +- .../web/processor}/VisitorProcessor.java | 16 +-- .../{ => web}/service/CollectService.java | 2 +- .../{ => web}/service/ITaskConfigService.java | 5 +- .../service}/ITaskOriginalMessageService.java | 6 +- .../web/service}/WebServiceServer.java | 38 +----- .../service/impl/TaskConfigServiceImpl.java | 8 +- .../impl/TaskOriginalMessageServiceImpl.java | 14 +- .../web/utils}/DateSpiltUtil.java | 2 +- .../{tool => collect/web/utils}/IdUtil.java | 2 +- .../web/utils}/ParamsUtils.java | 2 +- .../web/utils}/PeriodTime.java | 2 +- .../web/utils}/SpringUtils.java | 2 +- .../web/utils}/TableJsonRead.java | 2 +- .../java/com/docus/server/ws/WsCollect.java | 45 ------- pom.xml | 1 + 100 files changed, 299 insertions(+), 490 deletions(-) delete mode 100644 collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java rename common-collect/src/main/java/com/docus/server/collect/{service => }/ICollector.java (83%) rename common-collect/src/main/java/com/docus/server/{ws/convert => collect}/IConverter.java (82%) rename common-collect/src/main/java/com/docus/server/collect/{service => }/IHttpCollector.java (59%) rename common-collect/src/main/java/com/docus/server/{ws => collect}/IHttpResult.java (78%) rename common-collect/src/main/java/com/docus/server/collect/{job => }/IJob.java (56%) rename common-collect/src/main/java/com/docus/server/{ws => collect}/IMqResult.java (62%) rename common-collect/src/main/java/com/docus/server/{ws => collect}/IResult.java (80%) rename common-collect/src/main/java/com/docus/server/{ws => collect}/IWebServiceServer.java (86%) rename common-collect/src/main/java/com/docus/server/collect/{service => }/IWsCollector.java (59%) rename common-collect/src/main/java/com/docus/server/{ws => collect}/IWsResult.java (63%) rename common-collect/src/main/java/com/docus/server/collect/{controller/BasicController.java => basic/http/BasicRestController.java} (85%) rename common-collect/src/main/java/com/docus/server/collect/{job/basic => basic/http}/TBasicHttpCollectJob.java (81%) rename common-collect/src/main/java/com/docus/server/collect/{controller => basic/mq}/Test.java (96%) rename common-collect/src/main/java/com/docus/server/collect/{job/basic => basic/view}/TBasicViewCollectJob.java (84%) rename common-collect/src/main/java/com/docus/server/{ => collect/basic}/ws/IBasicServer.java (86%) rename common-collect/src/main/java/com/docus/server/collect/{job/basic => basic/ws}/TBasicWsCollectJob.java (71%) rename common-collect/src/main/java/com/docus/server/{ => collect/basic}/ws/impl/BasicServerImpl.java (77%) rename common-collect/src/main/java/com/docus/server/collect/{job/dept => dept/http}/DeptHttpCollectJob.java (79%) rename common-collect/src/main/java/com/docus/server/collect/{controller/DeptController.java => dept/http/DeptRestController.java} (77%) rename common-collect/src/main/java/com/docus/server/collect/{ => dept}/mq/IDeptMqCollectService.java (88%) rename common-collect/src/main/java/com/docus/server/collect/{mq/dept => dept/mq/impl}/DeptMqCollectServiceImpl.java (87%) rename common-collect/src/main/java/com/docus/server/collect/{job/dept => dept/view}/DeptViewCollectJob.java (84%) rename common-collect/src/main/java/com/docus/server/collect/{job/dept => dept/ws}/DeptWsCollectJob.java (71%) rename common-collect/src/main/java/com/docus/server/{ => collect/dept}/ws/IDeptServer.java (88%) rename common-collect/src/main/java/com/docus/server/{ => collect/dept}/ws/impl/DeptServerImpl.java (66%) rename common-collect/src/main/java/com/docus/server/{ws => collect/report}/event/TaskConsumptionReportDownEvent.java (93%) rename common-collect/src/main/java/com/docus/server/{ws => collect/report}/event/ThreePartyPushReportDownEvent.java (92%) rename common-collect/src/main/java/com/docus/server/{ws => collect/report}/listener/ReportDownListener.java (96%) rename common-collect/src/main/java/com/docus/server/{ws => collect/report/service}/IReportService.java (90%) rename common-collect/src/main/java/com/docus/server/{ws => collect/report/service}/impl/ReportServiceImpl.java (95%) rename common-collect/src/main/java/com/docus/server/{ => collect/report}/ws/IReportServer.java (96%) rename common-collect/src/main/java/com/docus/server/{ => collect/report}/ws/impl/ReportServerImpl.java (83%) delete mode 100644 common-collect/src/main/java/com/docus/server/collect/service/IParseService.java rename common-collect/src/main/java/com/docus/server/collect/{job/user => user/http}/UserHttpCollectJob.java (81%) rename common-collect/src/main/java/com/docus/server/collect/{controller/UserController.java => user/http/UserRestController.java} (77%) rename common-collect/src/main/java/com/docus/server/collect/{ => user}/mq/IUserMqCollectService.java (88%) rename common-collect/src/main/java/com/docus/server/collect/{mq/user => user/mq/impl}/UserMqCollectServiceImpl.java (87%) rename common-collect/src/main/java/com/docus/server/collect/{job/user => user/view}/UserViewCollectJob.java (84%) rename common-collect/src/main/java/com/docus/server/{ => collect/user}/ws/IUserServer.java (88%) rename common-collect/src/main/java/com/docus/server/collect/{job/user => user/ws}/UserWsCollectJob.java (81%) rename common-collect/src/main/java/com/docus/server/{ => collect/user}/ws/impl/UserServerImpl.java (63%) rename common-collect/src/main/java/com/docus/server/{ws => collect/web}/convert/TaskOriginalMessageConverter.java (80%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure/pojo => web}/domain/TaskConfig.java (90%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure/dao => web/enums}/CollectTypeEnum.java (94%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure => web}/enums/EnumItemView.java (90%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure => web}/enums/EnumTypeHandlerDispatch.java (96%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure/dao => web/enums}/FlagEnum.java (82%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure => web}/enums/IIntegerEnum.java (94%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure => web}/enums/IntegerEnumHandler.java (96%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure/dao => web/enums}/ReceiveDeptInfoEntity.java (89%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure/dao => web/enums}/StateEnum.java (77%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure/dao => web/enums}/TaskOriginalMessage.java (96%) rename common-collect/src/main/java/com/docus/server/collect/{ => web}/job/AbstractCollectJob.java (90%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure => web}/mapper/ReceiveDeptInfoMapper.java (60%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure => web}/mapper/TaskConfigMapper.java (58%) rename common-collect/src/main/java/com/docus/server/collect/{infrastructure => web}/mapper/TaskOriginalMessageMapper.java (66%) rename common-collect/src/main/java/com/docus/server/{visitor => collect/web/processor}/VisitorProcessor.java (86%) rename common-collect/src/main/java/com/docus/server/collect/{ => web}/service/CollectService.java (97%) rename common-collect/src/main/java/com/docus/server/collect/{ => web}/service/ITaskConfigService.java (65%) rename common-collect/src/main/java/com/docus/server/{ws => collect/web/service}/ITaskOriginalMessageService.java (58%) rename common-collect/src/main/java/com/docus/server/{ws/impl => collect/web/service}/WebServiceServer.java (89%) rename common-collect/src/main/java/com/docus/server/collect/{ => web}/service/impl/TaskConfigServiceImpl.java (78%) rename common-collect/src/main/java/com/docus/server/{ws => collect/web/service}/impl/TaskOriginalMessageServiceImpl.java (77%) rename common-collect/src/main/java/com/docus/server/{tool => collect/web/utils}/DateSpiltUtil.java (96%) rename common-collect/src/main/java/com/docus/server/{tool => collect/web/utils}/IdUtil.java (90%) rename common-collect/src/main/java/com/docus/server/{tool => collect/web/utils}/ParamsUtils.java (94%) rename common-collect/src/main/java/com/docus/server/{tool => collect/web/utils}/PeriodTime.java (90%) rename common-collect/src/main/java/com/docus/server/{tool => collect/web/utils}/SpringUtils.java (99%) rename common-collect/src/main/java/com/docus/server/{tool => collect/web/utils}/TableJsonRead.java (99%) delete mode 100644 common-collect/src/main/java/com/docus/server/ws/WsCollect.java diff --git a/collect-sdry/src/main/java/com/docus/server/CxfConfig.java b/collect-sdry/src/main/java/com/docus/server/CxfConfig.java index b0551d9..488d718 100644 --- a/collect-sdry/src/main/java/com/docus/server/CxfConfig.java +++ b/collect-sdry/src/main/java/com/docus/server/CxfConfig.java @@ -1,6 +1,6 @@ package com.docus.server; -import com.docus.server.ws.IWebServiceServer; +import com.docus.server.collect.IWebServiceServer; import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBus; import org.apache.cxf.jaxws.EndpointImpl; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpBasicResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpBasicResultImpl.java index a3441f7..4237031 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpBasicResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpBasicResultImpl.java @@ -2,7 +2,8 @@ package com.docus.server.collect.basic.http; import com.docus.infrastructure.web.api.CommonResult; import com.docus.log.context.TrackContext; -import com.docus.server.ws.IHttpResult; +import com.docus.server.collect.IHttpResult; +import com.docus.server.collect.web.processor.VisitorProcessor; import org.springframework.stereotype.Component; import java.util.Map; @@ -10,8 +11,8 @@ import java.util.Map; /** * 被动http返回响应类型，需要和controller返回类型一致 * - * @see com.docus.server.collect.controller.BasicController#insertHttpPassiveBasic(String) - * @see com.docus.server.visitor.VisitorProcessor#doProcess(TrackContext) + * @see BasicRestController#insertHttpPassiveBasic(String) + * @see VisitorProcessor#doProcess(TrackContext) */ @Component("httpBasicResultImpl") public class HttpBasicResultImpl implements IHttpResult { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java index 42cb1d9..1d1cc58 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.basic.http; -import com.docus.server.collect.service.IHttpCollector; +import com.docus.server.collect.IHttpCollector; import com.docus.server.record.pojo.dto.TBasicDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; @@ -12,7 +12,7 @@ import java.util.List; * 主动http收集器,返回从客户那边获取的数据 * * @see IHttpCollector - * @see com.docus.server.collect.job.basic.TBasicHttpCollectJob#execute(Date, Date, long, long) + * @see TBasicHttpCollectJob#execute(Date, Date, long, long) */ @Component("httpTBasicCollectorImpl") public class HttpTBasicCollectorImpl implements IHttpCollector { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java index 97ba585..5071820 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicConverter.java @@ -2,15 +2,17 @@ package com.docus.server.collect.basic.http; import com.docus.core.util.DateUtil; import com.docus.log.context.TrackContext; +import com.docus.server.collect.basic.ws.impl.BasicServerImpl; +import com.docus.server.collect.web.processor.VisitorProcessor; import com.docus.server.record.pojo.dto.TBasicDTO; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; /** * 被动请求参数转化器 * - * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String) - * @see com.docus.server.visitor.VisitorProcessor#beforeProcess(TrackContext) + * @see BasicServerImpl#setTBasic(String) + * @see VisitorProcessor#beforeProcess(TrackContext) */ @Component("httpTBasicConverter") public class HttpTBasicConverter implements IConverter { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java index 960148d..9b1dd0b 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.basic.ws; -import com.docus.server.collect.service.IWsCollector; +import com.docus.server.collect.IWsCollector; import com.docus.server.record.pojo.dto.TBasicDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicResultImpl.java index 0d89b4d..50c81ca 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicResultImpl.java @@ -3,7 +3,9 @@ package com.docus.server.collect.basic.ws; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; import com.docus.log.context.TrackContext; -import com.docus.server.ws.IWsResult; +import com.docus.server.collect.basic.ws.impl.BasicServerImpl; +import com.docus.server.collect.IWsResult; +import com.docus.server.collect.web.processor.VisitorProcessor; import org.springframework.stereotype.Component; import java.util.Date; @@ -12,8 +14,8 @@ import java.util.Map; /** * webservice被动请求响应类型，需要和controller返回类型保持一致 * - * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String) - * @see com.docus.server.visitor.VisitorProcessor#doProcess(TrackContext) + * @see BasicServerImpl#setTBasic(String) + * @see VisitorProcessor#doProcess(TrackContext) */ @Component("wsBasicResultImpl") public class WsBasicResultImpl implements IWsResult { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java index 627692c..03f6bde 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsTBasicConverter.java @@ -2,15 +2,17 @@ package com.docus.server.collect.basic.ws; import com.docus.core.util.DateUtil; import com.docus.log.context.TrackContext; +import com.docus.server.collect.basic.ws.impl.BasicServerImpl; +import com.docus.server.collect.web.processor.VisitorProcessor; import com.docus.server.record.pojo.dto.TBasicDTO; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; /** * 被动请求参数转化器 * - * @see com.docus.server.ws.impl.BasicServerImpl#setTBasic(String) - * @see com.docus.server.visitor.VisitorProcessor#beforeProcess(TrackContext) + * @see BasicServerImpl#setTBasic(String) + * @see VisitorProcessor#beforeProcess(TrackContext) */ @Component("wsTBasicConverter") public class WsTBasicConverter implements IConverter { diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java index eee3762..9f06099 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.dept.http; -import com.docus.server.collect.service.IHttpCollector; +import com.docus.server.collect.IHttpCollector; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptConverter.java index a8b999b..b75d7d6 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptConverter.java @@ -1,7 +1,7 @@ package com.docus.server.collect.dept.http; import com.docus.server.sys.common.pojo.dto.DeptDTO; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; import java.util.UUID; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptResultImpl.java index f9135c6..8b564ef 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptResultImpl.java @@ -1,7 +1,7 @@ package com.docus.server.collect.dept.http; import com.docus.infrastructure.web.api.CommonResult; -import com.docus.server.ws.IHttpResult; +import com.docus.server.collect.IHttpResult; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmListener.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmListener.java index c00c84f..84bb30e 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmListener.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/JmsIbmListener.java @@ -1,7 +1,6 @@ package com.docus.server.collect.dept.mq; -import com.docus.server.collect.mq.IDeptMqCollectService; -import com.docus.server.collect.mq.IUserMqCollectService; +import com.docus.server.collect.user.mq.IUserMqCollectService; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptConverter.java index fae385b..a8cdaf2 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptConverter.java @@ -1,7 +1,7 @@ package com.docus.server.collect.dept.mq; import com.docus.server.sys.common.pojo.dto.DeptDTO; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; import java.util.UUID; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptResultImpl.java index 8415376..f7bc555 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/mq/MqDeptResultImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.dept.mq; -import com.docus.server.ws.IMqResult; +import com.docus.server.collect.IMqResult; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java index 8e1a0c2..aa5c5ad 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.dept.ws; -import com.docus.server.collect.service.IWsCollector; +import com.docus.server.collect.IWsCollector; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptConverter.java index 6fd1e0b..a756685 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptConverter.java @@ -1,7 +1,7 @@ package com.docus.server.collect.dept.ws; import com.docus.server.sys.common.pojo.dto.DeptDTO; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; import java.util.UUID; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java index fdac60c..f350db9 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptResultImpl.java @@ -2,8 +2,8 @@ package com.docus.server.collect.dept.ws; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; -import com.docus.server.tool.IdUtil; -import com.docus.server.ws.IWsResult; +import com.docus.server.collect.web.utils.IdUtil; +import com.docus.server.collect.IWsResult; import org.springframework.stereotype.Component; import java.util.Date; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java deleted file mode 100644 index f3a3254..0000000 --- a/collect-sdry/src/main/java/com/docus/server/collect/medical/record/ParseServiceImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.docus.server.collect.medical.record; - -import com.docus.core.util.DateUtil; -import com.docus.core.util.Func; -import com.docus.core.util.XmlUtil; -import com.docus.server.collect.service.IParseService; -import com.docus.server.record.pojo.entity.MedicalRecord; -import com.docus.server.sys.common.pojo.dto.DeptDTO; -import com.docus.server.tool.IdUtil; -import org.springframework.stereotype.Service; -import org.w3c.dom.Node; - -import java.util.Date; - -@Service -public class ParseServiceImpl implements IParseService { - - @Override - public MedicalRecord parseHandNumbness(String handNumbness) { - //TODO： 根据协议进行解析。 - return null; - } - - - /** - * 新增/修改 科室解析 webservice 例子 - * - * @param deptXml - * @return - */ - @Override - public DeptDTO parseDeptXml(String deptXml) { - //TODO： 根据协议进行解析。 - XmlUtil xmlParseUtil = XmlUtil.of(deptXml); - Node msgIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/id/@extension"); - Node receiverNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/receiver/device/id/item/@extension"); - Node operateTypeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/@operateType"); - Node deptCodeNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_CODE/@value"); - Node deptNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/subject1/valueSet/valueSetItems/DEPT_NAME/@value"); - Node authorIdNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/id/item/@extension"); - Node authorNameNode = xmlParseUtil.getNode("/PRVS_IN000002UV01/controlActProcess/subject/registrationRequest/author/assignedEntity/assignedPerson/name/item/part/@value"); - - DeptDTO deptDto = new DeptDTO(); - deptDto.setMessageId(msgIdNode.getNodeValue()); - deptDto.setReceiver(receiverNode.getNodeValue()); - deptDto.setOperateType(operateTypeNode.getNodeValue()); - deptDto.setDeptCode(deptCodeNode.getNodeValue()); - deptDto.setDeptName(deptNameNode.getNodeValue()); - deptDto.setAuthorId(authorIdNode.getNodeValue()); - deptDto.setAuthorName(authorNameNode.getNodeValue()); - return deptDto; - } - - @Override - public String parseDeptOkXml(DeptDTO deptDTO) { - String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); - return "\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - ""; - } - - @Override - public String parseDeptFailXml(DeptDTO deptDto) { - String createTime = Func.format(new Date(), DateUtil.PATTERN_DATETIME_MINI); - return "\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\t\n" + - "\t\t\t\n" + - "\t\t\n" + - "\t\n" + - "\n"; - } -} diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java index b2e8c1f..e90e771 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java @@ -5,9 +5,9 @@ import com.docus.core.util.Func; import com.docus.core.util.XmlUtil; import com.docus.infrastructure.core.exception.BaseException; import com.docus.server.archivefile.pojo.dto.ReportDTO; -import com.docus.server.tool.ParamsUtils; -import com.docus.server.tool.TableJsonRead; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.web.utils.ParamsUtils; +import com.docus.server.collect.web.utils.TableJsonRead; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; import org.w3c.dom.Node; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/WsReportResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/report/WsReportResultImpl.java index d7b2ea5..09ba2c4 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/WsReportResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/WsReportResultImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.report; -import com.docus.server.ws.IWsResult; +import com.docus.server.collect.IWsResult; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java index 686e3c6..0232eee 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.user.http; -import com.docus.server.collect.service.IHttpCollector; +import com.docus.server.collect.IHttpCollector; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserConverter.java index 4fb186f..9f1c63a 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserConverter.java @@ -1,7 +1,7 @@ package com.docus.server.collect.user.http; import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; import java.util.UUID; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java index d3f09bd..1b1cb71 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserResultImpl.java @@ -1,7 +1,7 @@ package com.docus.server.collect.user.http; import com.docus.infrastructure.web.api.CommonResult; -import com.docus.server.ws.IHttpResult; +import com.docus.server.collect.IHttpResult; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserConverter.java index 5c42658..bb646ed 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserConverter.java @@ -1,7 +1,7 @@ package com.docus.server.collect.user.mq; import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; import java.util.UUID; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserResultImpl.java index d26a1e1..ac14d83 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/MqUserResultImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.user.mq; -import com.docus.server.ws.IMqResult; +import com.docus.server.collect.IMqResult; import org.springframework.stereotype.Component; import java.util.Map; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java index db14895..2db112e 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java @@ -1,6 +1,6 @@ package com.docus.server.collect.user.ws; -import com.docus.server.collect.service.IWsCollector; +import com.docus.server.collect.IWsCollector; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.google.common.collect.Lists; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserConverter.java index 4c91391..c9fe7e6 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserConverter.java @@ -1,7 +1,7 @@ package com.docus.server.collect.user.ws; import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; import java.util.UUID; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java index ed36abe..0011b33 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserResultImpl.java @@ -2,8 +2,8 @@ package com.docus.server.collect.user.ws; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; -import com.docus.server.tool.IdUtil; -import com.docus.server.ws.IWsResult; +import com.docus.server.collect.web.utils.IdUtil; +import com.docus.server.collect.IWsResult; import org.springframework.stereotype.Component; import java.util.Date; diff --git a/collect-sdry/src/main/resources/bootstrap.yml b/collect-sdry/src/main/resources/bootstrap.yml index 11b0e85..f025b73 100644 --- a/collect-sdry/src/main/resources/bootstrap.yml +++ b/collect-sdry/src/main/resources/bootstrap.yml @@ -12,21 +12,21 @@ spring: datasource: master: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/docus_archivefile?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: root - password: root + username: docus + password: docus702 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource his: url: jdbc:log4jdbc:mysql://db.docus.cn:3306/his?autoReconnect=true&allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai - username: root - password: root + username: docus + password: docus702 driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy type: com.alibaba.druid.pool.DruidDataSource redis: host: redis.docus.cn - # password: JSdocus@702 + password: JSdocus@702 cloud: nacos: discovery: @@ -39,12 +39,12 @@ spring: shared-configs: - comm.${spring.cloud.nacos.config.file-extension} - docus: dbtype: mysql user: # 用户默认密码 defpwd: fd29cd53ec12616e5f36b77d4afffbff + mybatis-plus: configuration: map-underscore-to-camel-case: true @@ -54,7 +54,7 @@ mybatis-plus: db-config: field-strategy: NOT_EMPTY db-type: MYSQL - type-enums-package: com.docus.server.collect.infrastructure.enums,com.docus.server.collect.infrastructure.dao + type-enums-package: com.docus.server.collect.web.enums xxl: job: accessToken: @@ -80,4 +80,4 @@ xxl: # replica: # queueManager: MqManager02 # channel: chl_server02 -# connName: 10.222.23.131(1414) +# connName: 10.222.23.131(1414) \ No newline at end of file diff --git a/collect-sdry/src/main/resources/logback.xml b/collect-sdry/src/main/resources/logback.xml index c7ed177..23dc795 100644 --- a/collect-sdry/src/main/resources/logback.xml +++ b/collect-sdry/src/main/resources/logback.xml @@ -1,6 +1,6 @@ - docus-server-fistpage + docus-collector @@ -44,7 +44,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/common-collect/src/main/java/com/docus/server/collect/service/ICollector.java b/common-collect/src/main/java/com/docus/server/collect/ICollector.java similarity index 83% rename from common-collect/src/main/java/com/docus/server/collect/service/ICollector.java rename to common-collect/src/main/java/com/docus/server/collect/ICollector.java index 33bfe31..8d08af5 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/ICollector.java +++ b/common-collect/src/main/java/com/docus/server/collect/ICollector.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.service; +package com.docus.server.collect; import java.util.Date; import java.util.List; diff --git a/common-collect/src/main/java/com/docus/server/ws/convert/IConverter.java b/common-collect/src/main/java/com/docus/server/collect/IConverter.java similarity index 82% rename from common-collect/src/main/java/com/docus/server/ws/convert/IConverter.java rename to common-collect/src/main/java/com/docus/server/collect/IConverter.java index f3d9cff..62cb021 100644 --- a/common-collect/src/main/java/com/docus/server/ws/convert/IConverter.java +++ b/common-collect/src/main/java/com/docus/server/collect/IConverter.java @@ -1,4 +1,4 @@ -package com.docus.server.ws.convert; +package com.docus.server.collect; public interface IConverter { diff --git a/common-collect/src/main/java/com/docus/server/collect/service/IHttpCollector.java b/common-collect/src/main/java/com/docus/server/collect/IHttpCollector.java similarity index 59% rename from common-collect/src/main/java/com/docus/server/collect/service/IHttpCollector.java rename to common-collect/src/main/java/com/docus/server/collect/IHttpCollector.java index ebfd545..d441805 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/IHttpCollector.java +++ b/common-collect/src/main/java/com/docus/server/collect/IHttpCollector.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.service; +package com.docus.server.collect; public interface IHttpCollector extends ICollector { } diff --git a/common-collect/src/main/java/com/docus/server/ws/IHttpResult.java b/common-collect/src/main/java/com/docus/server/collect/IHttpResult.java similarity index 78% rename from common-collect/src/main/java/com/docus/server/ws/IHttpResult.java rename to common-collect/src/main/java/com/docus/server/collect/IHttpResult.java index f98f788..e7b6946 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IHttpResult.java +++ b/common-collect/src/main/java/com/docus/server/collect/IHttpResult.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect; import com.docus.infrastructure.web.api.CommonResult; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/IJob.java b/common-collect/src/main/java/com/docus/server/collect/IJob.java similarity index 56% rename from common-collect/src/main/java/com/docus/server/collect/job/IJob.java rename to common-collect/src/main/java/com/docus/server/collect/IJob.java index 49258f3..c653dfb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/IJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/IJob.java @@ -1,7 +1,7 @@ -package com.docus.server.collect.job; +package com.docus.server.collect; -import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig; -import com.docus.server.tool.PeriodTime; +import com.docus.server.collect.web.domain.TaskConfig; +import com.docus.server.collect.web.utils.PeriodTime; public interface IJob { diff --git a/common-collect/src/main/java/com/docus/server/ws/IMqResult.java b/common-collect/src/main/java/com/docus/server/collect/IMqResult.java similarity index 62% rename from common-collect/src/main/java/com/docus/server/ws/IMqResult.java rename to common-collect/src/main/java/com/docus/server/collect/IMqResult.java index 6aee4a7..80eec9d 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IMqResult.java +++ b/common-collect/src/main/java/com/docus/server/collect/IMqResult.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect; public interface IMqResult extends IResult { diff --git a/common-collect/src/main/java/com/docus/server/ws/IResult.java b/common-collect/src/main/java/com/docus/server/collect/IResult.java similarity index 80% rename from common-collect/src/main/java/com/docus/server/ws/IResult.java rename to common-collect/src/main/java/com/docus/server/collect/IResult.java index f486457..2c16774 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IResult.java +++ b/common-collect/src/main/java/com/docus/server/collect/IResult.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect; import java.util.Map; diff --git a/common-collect/src/main/java/com/docus/server/ws/IWebServiceServer.java b/common-collect/src/main/java/com/docus/server/collect/IWebServiceServer.java similarity index 86% rename from common-collect/src/main/java/com/docus/server/ws/IWebServiceServer.java rename to common-collect/src/main/java/com/docus/server/collect/IWebServiceServer.java index 6bdf16f..b647a74 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IWebServiceServer.java +++ b/common-collect/src/main/java/com/docus/server/collect/IWebServiceServer.java @@ -1,24 +1,10 @@ -package com.docus.server.ws; +package com.docus.server.collect; import javax.jws.WebService; @WebService public interface IWebServiceServer { - /** - * 接收xml。并且下载病案。 - */ - String receiveHandNumbness(String handNumbness); - - /** - * 接收部门xml - * - * @param deptXml - * @return - */ - String receiveDept(String deptXml); - - /** * 科室信息接收，进行操作 * diff --git a/common-collect/src/main/java/com/docus/server/collect/service/IWsCollector.java b/common-collect/src/main/java/com/docus/server/collect/IWsCollector.java similarity index 59% rename from common-collect/src/main/java/com/docus/server/collect/service/IWsCollector.java rename to common-collect/src/main/java/com/docus/server/collect/IWsCollector.java index 6eb21a8..48db912 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/IWsCollector.java +++ b/common-collect/src/main/java/com/docus/server/collect/IWsCollector.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.service; +package com.docus.server.collect; public interface IWsCollector extends ICollector { diff --git a/common-collect/src/main/java/com/docus/server/ws/IWsResult.java b/common-collect/src/main/java/com/docus/server/collect/IWsResult.java similarity index 63% rename from common-collect/src/main/java/com/docus/server/ws/IWsResult.java rename to common-collect/src/main/java/com/docus/server/collect/IWsResult.java index acc4ff9..e2faf90 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IWsResult.java +++ b/common-collect/src/main/java/com/docus/server/collect/IWsResult.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect; public interface IWsResult extends IResult { diff --git a/common-collect/src/main/java/com/docus/server/collect/controller/BasicController.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java similarity index 85% rename from common-collect/src/main/java/com/docus/server/collect/controller/BasicController.java rename to common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java index a11af23..9579758 100644 --- a/common-collect/src/main/java/com/docus/server/collect/controller/BasicController.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java @@ -1,12 +1,15 @@ -package com.docus.server.collect.controller; +package com.docus.server.collect.basic.http; import com.docus.core.util.json.JSON; import com.docus.infrastructure.web.api.CommonResult; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; +import com.docus.server.collect.IConverter; +import com.docus.server.collect.IHttpResult; +import com.docus.server.collect.web.enums.CollectTypeEnum; import com.docus.server.record.pojo.dto.TBasicDTO; import com.docus.server.record.service.ITBasicService; -import com.docus.server.visitor.VisitorProcessor; +import com.docus.server.collect.web.processor.VisitorProcessor; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -21,9 +24,9 @@ import javax.annotation.Resource; /** * @author wen yongbin * @date 2023年2月25日21:56:33 - * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举 - * @see com.docus.server.ws.convert.IConverter 通用转化器 - * @see com.docus.server.ws.IHttpResult 通用返回结果 + * @see CollectTypeEnum 枚举 + * @see IConverter 通用转化器 + * @see IHttpResult 通用返回结果 * @see VisitorProcessor 通用处理器 */ @@ -31,7 +34,7 @@ import javax.annotation.Resource; @Slf4j @RestController @RequestMapping("/api/rest/basic") -public class BasicController { +public class BasicRestController { @Resource private ITBasicService tBasicService; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java similarity index 81% rename from common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicHttpCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java index 71abe36..9bc6a82 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java @@ -1,7 +1,8 @@ -package com.docus.server.collect.job.basic; +package com.docus.server.collect.basic.http; -import com.docus.server.collect.job.AbstractCollectJob; -import com.docus.server.collect.service.ICollector; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.IHttpCollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.record.pojo.dto.TBasicDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动http请求基础数据job * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.IHttpCollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see IHttpCollector */ @Component public class TBasicHttpCollectJob extends AbstractCollectJob { diff --git a/common-collect/src/main/java/com/docus/server/collect/controller/Test.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/Test.java similarity index 96% rename from common-collect/src/main/java/com/docus/server/collect/controller/Test.java rename to common-collect/src/main/java/com/docus/server/collect/basic/mq/Test.java index f0241d3..d5deedd 100644 --- a/common-collect/src/main/java/com/docus/server/collect/controller/Test.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/Test.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.controller; +package com.docus.server.collect.basic.mq; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java similarity index 84% rename from common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicViewCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java index 91f59d6..a689ef3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java @@ -1,6 +1,7 @@ -package com.docus.server.collect.job.basic; +package com.docus.server.collect.basic.view; -import com.docus.server.collect.job.AbstractCollectJob; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.his.service.IHisService; import com.docus.server.record.pojo.dto.TBasicDTO; import com.xxl.job.core.handler.annotation.XxlJob; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动view请求基础数据job * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.ICollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see ICollector */ @Component public class TBasicViewCollectJob extends AbstractCollectJob { diff --git a/common-collect/src/main/java/com/docus/server/ws/IBasicServer.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/IBasicServer.java similarity index 86% rename from common-collect/src/main/java/com/docus/server/ws/IBasicServer.java rename to common-collect/src/main/java/com/docus/server/collect/basic/ws/IBasicServer.java index 68dc5fd..32a28ed 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IBasicServer.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/IBasicServer.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect.basic.ws; import javax.jws.WebService; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java similarity index 71% rename from common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicWsCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java index ef3af04..11649fb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/basic/TBasicWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java @@ -1,7 +1,8 @@ -package com.docus.server.collect.job.basic; +package com.docus.server.collect.basic.ws; -import com.docus.server.collect.job.AbstractCollectJob; -import com.docus.server.collect.service.ICollector; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.IWsCollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动webservice请求基础数据 * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.IWsCollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see IWsCollector */ @Component public class TBasicWsCollectJob extends AbstractCollectJob { @@ -25,16 +26,16 @@ public class TBasicWsCollectJob extends AbstractCollectJob { /** * xxl jobhandler 手工执行 */ - @XxlJob("startAllUserWsCollect") - public void startAllUserWsCollect() { + @XxlJob("startAllTBasicWsCollect") + public void startAllTBasicWsCollect() { super.startCollectAll(getJobParam()); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ - @XxlJob("startIncUserWsCollect") - public void startIncUserWsCollect() { + @XxlJob("startIncTBasicWsCollect") + public void startIncTBasicWsCollect() { super.startCollectIncrement(getJobParam()); } diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/BasicServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java similarity index 77% rename from common-collect/src/main/java/com/docus/server/ws/impl/BasicServerImpl.java rename to common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java index ab2c491..fbf13c1 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/BasicServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java @@ -1,12 +1,15 @@ -package com.docus.server.ws.impl; +package com.docus.server.collect.basic.ws.impl; import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; +import com.docus.server.collect.IConverter; +import com.docus.server.collect.IWsResult; +import com.docus.server.collect.web.enums.CollectTypeEnum; import com.docus.server.record.pojo.dto.TBasicDTO; import com.docus.server.record.service.ITBasicService; -import com.docus.server.visitor.VisitorProcessor; -import com.docus.server.ws.IBasicServer; +import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.basic.ws.IBasicServer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,9 +18,9 @@ import javax.annotation.Resource; /** * @author wen yongbin * @date 2023年2月25日21:56:33 - * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举 - * @see com.docus.server.ws.convert.IConverter 通用转化器 - * @see com.docus.server.ws.IWsResult 通用返回结果 + * @see CollectTypeEnum 枚举 + * @see IConverter 通用转化器 + * @see IWsResult 通用返回结果 * @see VisitorProcessor 通用处理器 */ @Service diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java similarity index 79% rename from common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java index 4e9c1b6..16f9fe1 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java @@ -1,7 +1,8 @@ -package com.docus.server.collect.job.dept; +package com.docus.server.collect.dept.http; -import com.docus.server.collect.job.AbstractCollectJob; -import com.docus.server.collect.service.ICollector; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.IHttpCollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动http请求科室数据job * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.IHttpCollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see IHttpCollector */ @Component public class DeptHttpCollectJob extends AbstractCollectJob { diff --git a/common-collect/src/main/java/com/docus/server/collect/controller/DeptController.java b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java similarity index 77% rename from common-collect/src/main/java/com/docus/server/collect/controller/DeptController.java rename to common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java index 4d6a292..20c0f74 100644 --- a/common-collect/src/main/java/com/docus/server/collect/controller/DeptController.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java @@ -1,12 +1,15 @@ -package com.docus.server.collect.controller; +package com.docus.server.collect.dept.http; import com.docus.core.util.json.JSON; import com.docus.infrastructure.web.api.CommonResult; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; -import com.docus.server.collect.service.CollectService; +import com.docus.server.collect.IConverter; +import com.docus.server.collect.IHttpResult; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.DeptDTO; -import com.docus.server.visitor.VisitorProcessor; +import com.docus.server.collect.web.processor.VisitorProcessor; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -21,9 +24,9 @@ import javax.annotation.Resource; /** * @author wen yongbin * @date 2023年2月25日21:56:33 - * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举 - * @see com.docus.server.ws.convert.IConverter 通用转化器 - * @see com.docus.server.ws.IHttpResult 通用返回结果 + * @see CollectTypeEnum 枚举 + * @see IConverter 通用转化器 + * @see IHttpResult 通用返回结果 * @see VisitorProcessor 通用处理器 */ @@ -31,7 +34,7 @@ import javax.annotation.Resource; @Slf4j @RestController @RequestMapping("/api/rest/dept") -public class DeptController { +public class DeptRestController { @Resource private CollectService collectService; diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/IDeptMqCollectService.java b/common-collect/src/main/java/com/docus/server/collect/dept/mq/IDeptMqCollectService.java similarity index 88% rename from common-collect/src/main/java/com/docus/server/collect/mq/IDeptMqCollectService.java rename to common-collect/src/main/java/com/docus/server/collect/dept/mq/IDeptMqCollectService.java index 4e65807..8501dc9 100644 --- a/common-collect/src/main/java/com/docus/server/collect/mq/IDeptMqCollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/mq/IDeptMqCollectService.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.mq; +package com.docus.server.collect.dept.mq; public interface IDeptMqCollectService { diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/dept/DeptMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptMqCollectServiceImpl.java similarity index 87% rename from common-collect/src/main/java/com/docus/server/collect/mq/dept/DeptMqCollectServiceImpl.java rename to common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptMqCollectServiceImpl.java index 6241fae..91bd3ce 100644 --- a/common-collect/src/main/java/com/docus/server/collect/mq/dept/DeptMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptMqCollectServiceImpl.java @@ -1,12 +1,12 @@ -package com.docus.server.collect.mq.dept; +package com.docus.server.collect.dept.mq.impl; import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; -import com.docus.server.collect.mq.IDeptMqCollectService; -import com.docus.server.collect.service.CollectService; +import com.docus.server.collect.dept.mq.IDeptMqCollectService; +import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.DeptDTO; -import com.docus.server.visitor.VisitorProcessor; +import com.docus.server.collect.web.processor.VisitorProcessor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java similarity index 84% rename from common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java index a0fc459..e3d5561 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java @@ -1,6 +1,7 @@ -package com.docus.server.collect.job.dept; +package com.docus.server.collect.dept.view; -import com.docus.server.collect.job.AbstractCollectJob; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.his.service.IHisService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.xxl.job.core.handler.annotation.XxlJob; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动view请求科室数据job * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.ICollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see ICollector */ @Component public class DeptViewCollectJob extends AbstractCollectJob { diff --git a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java similarity index 71% rename from common-collect/src/main/java/com/docus/server/collect/job/dept/DeptWsCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java index b5e6633..e37d231 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/dept/DeptWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java @@ -1,7 +1,8 @@ -package com.docus.server.collect.job.dept; +package com.docus.server.collect.dept.ws; -import com.docus.server.collect.job.AbstractCollectJob; -import com.docus.server.collect.service.ICollector; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.IWsCollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动webservice请求科室数据job * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.IWsCollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see IWsCollector */ @Component public class DeptWsCollectJob extends AbstractCollectJob { @@ -25,16 +26,16 @@ public class DeptWsCollectJob extends AbstractCollectJob { /** * xxl jobhandler 手工执行 */ - @XxlJob("startAllUserWsCollect") - public void startAllUserWsCollect() { + @XxlJob("startAllDeptWsCollect") + public void startAllDeptWsCollect() { super.startCollectAll(getJobParam()); } /** * xxl jobhandler 配置定时启动，如果未完成任务跳过。 */ - @XxlJob("startIncUserWsCollect") - public void startIncUserWsCollect() { + @XxlJob("startIncDeptWsCollect") + public void startIncDeptWsCollect() { super.startCollectIncrement(getJobParam()); } diff --git a/common-collect/src/main/java/com/docus/server/ws/IDeptServer.java b/common-collect/src/main/java/com/docus/server/collect/dept/ws/IDeptServer.java similarity index 88% rename from common-collect/src/main/java/com/docus/server/ws/IDeptServer.java rename to common-collect/src/main/java/com/docus/server/collect/dept/ws/IDeptServer.java index c173504..c94d999 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IDeptServer.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/ws/IDeptServer.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect.dept.ws; import javax.jws.WebService; diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java similarity index 66% rename from common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java rename to common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java index 8128a36..57c026f 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/DeptServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java @@ -1,12 +1,15 @@ -package com.docus.server.ws.impl; +package com.docus.server.collect.dept.ws.impl; import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; -import com.docus.server.collect.service.CollectService; +import com.docus.server.collect.IConverter; +import com.docus.server.collect.IWsResult; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.DeptDTO; -import com.docus.server.visitor.VisitorProcessor; -import com.docus.server.ws.IDeptServer; +import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.dept.ws.IDeptServer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,9 +18,9 @@ import javax.annotation.Resource; /** * @author wen yongbin * @date 2023年2月25日21:56:33 - * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举 - * @see com.docus.server.ws.convert.IConverter 通用转化器 - * @see com.docus.server.ws.IWsResult 通用返回结果 + * @see CollectTypeEnum 枚举 + * @see IConverter 通用转化器 + * @see IWsResult 通用返回结果 * @see VisitorProcessor 通用处理器 */ @Service diff --git a/common-collect/src/main/java/com/docus/server/ws/event/TaskConsumptionReportDownEvent.java b/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java similarity index 93% rename from common-collect/src/main/java/com/docus/server/ws/event/TaskConsumptionReportDownEvent.java rename to common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java index 18665b3..259adf8 100644 --- a/common-collect/src/main/java/com/docus/server/ws/event/TaskConsumptionReportDownEvent.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java @@ -1,4 +1,4 @@ -package com.docus.server.ws.event; +package com.docus.server.collect.report.event; import com.docus.server.archivefile.pojo.dto.ReportDTO; import lombok.Getter; diff --git a/common-collect/src/main/java/com/docus/server/ws/event/ThreePartyPushReportDownEvent.java b/common-collect/src/main/java/com/docus/server/collect/report/event/ThreePartyPushReportDownEvent.java similarity index 92% rename from common-collect/src/main/java/com/docus/server/ws/event/ThreePartyPushReportDownEvent.java rename to common-collect/src/main/java/com/docus/server/collect/report/event/ThreePartyPushReportDownEvent.java index 40a371b..58c1f3d 100644 --- a/common-collect/src/main/java/com/docus/server/ws/event/ThreePartyPushReportDownEvent.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/event/ThreePartyPushReportDownEvent.java @@ -1,4 +1,4 @@ -package com.docus.server.ws.event; +package com.docus.server.collect.report.event; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/common-collect/src/main/java/com/docus/server/ws/listener/ReportDownListener.java b/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java similarity index 96% rename from common-collect/src/main/java/com/docus/server/ws/listener/ReportDownListener.java rename to common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java index 232afa6..e49bb75 100644 --- a/common-collect/src/main/java/com/docus/server/ws/listener/ReportDownListener.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java @@ -1,4 +1,4 @@ -package com.docus.server.ws.listener; +package com.docus.server.collect.report.listener; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; @@ -12,8 +12,8 @@ import com.docus.server.archivefile.pojo.dto.ReportDownDTO; import com.docus.server.archivefile.pojo.dto.ReportDownPatientDTO; import com.docus.server.archivefile.pojo.dto.ReportDownScanFileDTO; import com.docus.server.archivefile.pojo.entity.AfReportRecord; -import com.docus.server.ws.event.TaskConsumptionReportDownEvent; -import com.docus.server.ws.event.ThreePartyPushReportDownEvent; +import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent; +import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; diff --git a/common-collect/src/main/java/com/docus/server/ws/IReportService.java b/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java similarity index 90% rename from common-collect/src/main/java/com/docus/server/ws/IReportService.java rename to common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java index ccaa5b7..63493e7 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IReportService.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect.report.service; import com.docus.server.archivefile.pojo.dto.ReportDTO; diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/ReportServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java similarity index 95% rename from common-collect/src/main/java/com/docus/server/ws/impl/ReportServiceImpl.java rename to common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java index c27edb9..9b30d62 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/ReportServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java @@ -1,4 +1,4 @@ -package com.docus.server.ws.impl; +package com.docus.server.collect.report.service.impl; import com.docus.core.util.Func; import com.docus.infrastructure.redis.service.IdService; @@ -7,10 +7,10 @@ import com.docus.server.archivefile.mapper.AfReportRecordMapper; import com.docus.server.archivefile.pojo.dto.ReportDTO; import com.docus.server.archivefile.pojo.entity.AfCollectTask; import com.docus.server.archivefile.pojo.entity.AfReportRecord; +import com.docus.server.collect.report.service.IReportService; import com.docus.server.record.mapper.TBasicMapper; -import com.docus.server.ws.IReportService; -import com.docus.server.ws.event.TaskConsumptionReportDownEvent; -import com.docus.server.ws.event.ThreePartyPushReportDownEvent; +import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent; +import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/ws/IReportServer.java b/common-collect/src/main/java/com/docus/server/collect/report/ws/IReportServer.java similarity index 96% rename from common-collect/src/main/java/com/docus/server/ws/IReportServer.java rename to common-collect/src/main/java/com/docus/server/collect/report/ws/IReportServer.java index b7f5519..3ff6440 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IReportServer.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/ws/IReportServer.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect.report.ws; import javax.jws.WebService; diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/ReportServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java similarity index 83% rename from common-collect/src/main/java/com/docus/server/ws/impl/ReportServerImpl.java rename to common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java index 6880d46..e513c54 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/ReportServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java @@ -1,12 +1,15 @@ -package com.docus.server.ws.impl; +package com.docus.server.collect.report.ws.impl; import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; +import com.docus.server.collect.IConverter; +import com.docus.server.collect.IWsResult; import com.docus.server.archivefile.pojo.dto.ReportDTO; -import com.docus.server.visitor.VisitorProcessor; -import com.docus.server.ws.IReportServer; -import com.docus.server.ws.IReportService; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.report.ws.IReportServer; +import com.docus.server.collect.report.service.IReportService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,9 +18,9 @@ import javax.annotation.Resource; /** * @author wyb * @date 2023年3月3日13:42:36 - * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举 - * @see com.docus.server.ws.convert.IConverter 通用转化器 - * @see com.docus.server.ws.IWsResult 通用返回结果 + * @see CollectTypeEnum 枚举 + * @see IConverter 通用转化器 + * @see IWsResult 通用返回结果 * @see VisitorProcessor 通用处理器 */ @Service diff --git a/common-collect/src/main/java/com/docus/server/collect/service/IParseService.java b/common-collect/src/main/java/com/docus/server/collect/service/IParseService.java deleted file mode 100644 index 3118df3..0000000 --- a/common-collect/src/main/java/com/docus/server/collect/service/IParseService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.docus.server.collect.service; - -import com.docus.server.record.pojo.entity.MedicalRecord; -import com.docus.server.sys.common.pojo.dto.DeptDTO; - -public interface IParseService { - MedicalRecord parseHandNumbness(String handNumbness); - - DeptDTO parseDeptXml(String deptXml); - - String parseDeptOkXml(DeptDTO receiveUser); - - String parseDeptFailXml(DeptDTO deptDto); -} diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java similarity index 81% rename from common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java index ebc78e3..11181a7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/UserHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java @@ -1,7 +1,8 @@ -package com.docus.server.collect.job.user; +package com.docus.server.collect.user.http; -import com.docus.server.collect.job.AbstractCollectJob; -import com.docus.server.collect.service.ICollector; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.IHttpCollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动http请求用户数据job * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.IHttpCollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see IHttpCollector */ @Component public class UserHttpCollectJob extends AbstractCollectJob { diff --git a/common-collect/src/main/java/com/docus/server/collect/controller/UserController.java b/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java similarity index 77% rename from common-collect/src/main/java/com/docus/server/collect/controller/UserController.java rename to common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java index cc8073b..380cd75 100644 --- a/common-collect/src/main/java/com/docus/server/collect/controller/UserController.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java @@ -1,12 +1,15 @@ -package com.docus.server.collect.controller; +package com.docus.server.collect.user.http; import com.docus.core.util.json.JSON; import com.docus.infrastructure.web.api.CommonResult; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; -import com.docus.server.collect.service.CollectService; +import com.docus.server.collect.IConverter; +import com.docus.server.collect.IHttpResult; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.visitor.VisitorProcessor; +import com.docus.server.collect.web.processor.VisitorProcessor; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -21,9 +24,9 @@ import javax.annotation.Resource; /** * @author wen yongbin * @date 2023年2月25日21:56:33 - * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举 - * @see com.docus.server.ws.convert.IConverter 通用转化器 - * @see com.docus.server.ws.IHttpResult 通用返回结果 + * @see CollectTypeEnum 枚举 + * @see IConverter 通用转化器 + * @see IHttpResult 通用返回结果 * @see VisitorProcessor 通用处理器 */ @@ -31,7 +34,7 @@ import javax.annotation.Resource; @Slf4j @RestController @RequestMapping("/api/rest/user") -public class UserController { +public class UserRestController { @Resource private CollectService collectService; diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/IUserMqCollectService.java b/common-collect/src/main/java/com/docus/server/collect/user/mq/IUserMqCollectService.java similarity index 88% rename from common-collect/src/main/java/com/docus/server/collect/mq/IUserMqCollectService.java rename to common-collect/src/main/java/com/docus/server/collect/user/mq/IUserMqCollectService.java index 6a047e0..42935fb 100644 --- a/common-collect/src/main/java/com/docus/server/collect/mq/IUserMqCollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/mq/IUserMqCollectService.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.mq; +package com.docus.server.collect.user.mq; public interface IUserMqCollectService { diff --git a/common-collect/src/main/java/com/docus/server/collect/mq/user/UserMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserMqCollectServiceImpl.java similarity index 87% rename from common-collect/src/main/java/com/docus/server/collect/mq/user/UserMqCollectServiceImpl.java rename to common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserMqCollectServiceImpl.java index 4a15597..ae3e199 100644 --- a/common-collect/src/main/java/com/docus/server/collect/mq/user/UserMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserMqCollectServiceImpl.java @@ -1,12 +1,12 @@ -package com.docus.server.collect.mq.user; +package com.docus.server.collect.user.mq.impl; import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; -import com.docus.server.collect.mq.IUserMqCollectService; -import com.docus.server.collect.service.CollectService; +import com.docus.server.collect.user.mq.IUserMqCollectService; +import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.visitor.VisitorProcessor; +import com.docus.server.collect.web.processor.VisitorProcessor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java similarity index 84% rename from common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java index 4dea710..3ee6317 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java @@ -1,6 +1,7 @@ -package com.docus.server.collect.job.user; +package com.docus.server.collect.user.view; -import com.docus.server.collect.job.AbstractCollectJob; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.his.service.IHisService; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.xxl.job.core.handler.annotation.XxlJob; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动view请求用户数据job * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.ICollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see ICollector */ @Component public class UserViewCollectJob extends AbstractCollectJob { diff --git a/common-collect/src/main/java/com/docus/server/ws/IUserServer.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/IUserServer.java similarity index 88% rename from common-collect/src/main/java/com/docus/server/ws/IUserServer.java rename to common-collect/src/main/java/com/docus/server/collect/user/ws/IUserServer.java index f0d72b5..61ed3dc 100644 --- a/common-collect/src/main/java/com/docus/server/ws/IUserServer.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/IUserServer.java @@ -1,4 +1,4 @@ -package com.docus.server.ws; +package com.docus.server.collect.user.ws; import javax.jws.WebService; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/user/UserWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java similarity index 81% rename from common-collect/src/main/java/com/docus/server/collect/job/user/UserWsCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java index 8e1b9cb..9aee1b3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/user/UserWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java @@ -1,7 +1,8 @@ -package com.docus.server.collect.job.user; +package com.docus.server.collect.user.ws; -import com.docus.server.collect.job.AbstractCollectJob; -import com.docus.server.collect.service.ICollector; +import com.docus.server.collect.ICollector; +import com.docus.server.collect.IWsCollector; +import com.docus.server.collect.web.job.AbstractCollectJob; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -13,9 +14,9 @@ import java.util.List; /** * 主动webservice请求用户数据job * - * @see com.docus.server.collect.job.AbstractCollectJob - * @see com.docus.server.collect.job.IJob - * @see com.docus.server.collect.service.IWsCollector + * @see AbstractCollectJob + * @see com.docus.server.collect.IJob + * @see IWsCollector */ @Component public class UserWsCollectJob extends AbstractCollectJob { diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java similarity index 63% rename from common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java rename to common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java index 400d27a..b9ed498 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/UserServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java @@ -1,12 +1,15 @@ -package com.docus.server.ws.impl; +package com.docus.server.collect.user.ws.impl; import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; -import com.docus.server.collect.service.CollectService; +import com.docus.server.collect.IConverter; +import com.docus.server.collect.IWsResult; +import com.docus.server.collect.user.ws.IUserServer; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; -import com.docus.server.visitor.VisitorProcessor; -import com.docus.server.ws.IUserServer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -15,10 +18,10 @@ import javax.annotation.Resource; /** * @author wen yongbin * @date 2023年2月25日21:56:33 - * @see com.docus.server.collect.infrastructure.dao.CollectTypeEnum 枚举 - * @see com.docus.server.ws.convert.IConverter 通用转化器 - * @see com.docus.server.ws.IWsResult 通用返回结果 - * @see com.docus.server.visitor.VisitorProcessor 通用处理器 + * @see CollectTypeEnum 枚举 + * @see IConverter 通用转化器 + * @see IWsResult 通用返回结果 + * @see VisitorProcessor 通用处理器 */ @Service @Slf4j @@ -38,7 +41,7 @@ public class UserServerImpl implements IUserServer { beanNames = {"wsUserConverter", "wsUserResultImpl"}, processor = VisitorProcessor.class) public String userModify(String message) { - log.debug("新增/修改用户数据：{}", message); + log.info("新增/修改用户数据：{}", message); collectService.insertOrUpdateUser(JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), UserDTO.class)); return null; } diff --git a/common-collect/src/main/java/com/docus/server/ws/convert/TaskOriginalMessageConverter.java b/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java similarity index 80% rename from common-collect/src/main/java/com/docus/server/ws/convert/TaskOriginalMessageConverter.java rename to common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java index e36fdf8..284fcd8 100644 --- a/common-collect/src/main/java/com/docus/server/ws/convert/TaskOriginalMessageConverter.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java @@ -1,10 +1,10 @@ -package com.docus.server.ws.convert; +package com.docus.server.collect.web.convert; import com.docus.core.util.DateUtil; import com.docus.infrastructure.redis.service.IdService; -import com.docus.server.collect.infrastructure.dao.CollectTypeEnum; -import com.docus.server.collect.infrastructure.dao.StateEnum; -import com.docus.server.collect.infrastructure.dao.TaskOriginalMessage; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.enums.StateEnum; +import com.docus.server.collect.web.enums.TaskOriginalMessage; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/pojo/domain/TaskConfig.java b/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java similarity index 90% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/pojo/domain/TaskConfig.java rename to common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java index 1762261..4774b22 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/pojo/domain/TaskConfig.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java @@ -1,7 +1,7 @@ -package com.docus.server.collect.infrastructure.pojo.domain; +package com.docus.server.collect.web.domain; -import com.docus.server.tool.DateSpiltUtil; -import com.docus.server.tool.PeriodTime; +import com.docus.server.collect.web.utils.DateSpiltUtil; +import com.docus.server.collect.web.utils.PeriodTime; import lombok.Data; import java.util.Date; diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java similarity index 94% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java index a88d789..784dc9c 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/CollectTypeEnum.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java @@ -1,6 +1,4 @@ -package com.docus.server.collect.infrastructure.dao; - -import com.docus.server.collect.infrastructure.enums.IIntegerEnum; +package com.docus.server.collect.web.enums; public enum CollectTypeEnum implements IIntegerEnum { diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/EnumItemView.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/EnumItemView.java similarity index 90% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/EnumItemView.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/EnumItemView.java index 4697cfa..9efc446 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/EnumItemView.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/EnumItemView.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.infrastructure.enums; +package com.docus.server.collect.web.enums; public class EnumItemView { diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/EnumTypeHandlerDispatch.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/EnumTypeHandlerDispatch.java similarity index 96% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/EnumTypeHandlerDispatch.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/EnumTypeHandlerDispatch.java index 03e376f..a22a1c4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/EnumTypeHandlerDispatch.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/EnumTypeHandlerDispatch.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.infrastructure.enums; +package com.docus.server.collect.web.enums; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.EnumTypeHandler; diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/FlagEnum.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/FlagEnum.java similarity index 82% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/FlagEnum.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/FlagEnum.java index a116df0..d3391d7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/FlagEnum.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/FlagEnum.java @@ -1,6 +1,4 @@ -package com.docus.server.collect.infrastructure.dao; - -import com.docus.server.collect.infrastructure.enums.IIntegerEnum; +package com.docus.server.collect.web.enums; public enum FlagEnum implements IIntegerEnum { INSERT(1, "新增"), diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/IIntegerEnum.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/IIntegerEnum.java similarity index 94% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/IIntegerEnum.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/IIntegerEnum.java index 76602ee..0e59172 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/IIntegerEnum.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/IIntegerEnum.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.infrastructure.enums; +package com.docus.server.collect.web.enums; import com.baomidou.mybatisplus.annotation.IEnum; diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/IntegerEnumHandler.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/IntegerEnumHandler.java similarity index 96% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/IntegerEnumHandler.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/IntegerEnumHandler.java index 5b2f3ba..fd263a0 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/enums/IntegerEnumHandler.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/IntegerEnumHandler.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.infrastructure.enums; +package com.docus.server.collect.web.enums; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/ReceiveDeptInfoEntity.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/ReceiveDeptInfoEntity.java similarity index 89% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/ReceiveDeptInfoEntity.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/ReceiveDeptInfoEntity.java index 062870d..f325219 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/ReceiveDeptInfoEntity.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/ReceiveDeptInfoEntity.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.infrastructure.dao; +package com.docus.server.collect.web.enums; import lombok.Data; diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/StateEnum.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/StateEnum.java similarity index 77% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/StateEnum.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/StateEnum.java index 3f57c77..c9514ea 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/StateEnum.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/StateEnum.java @@ -1,6 +1,6 @@ -package com.docus.server.collect.infrastructure.dao; +package com.docus.server.collect.web.enums; -import com.docus.server.collect.infrastructure.enums.IIntegerEnum; +import com.docus.server.collect.web.enums.IIntegerEnum; public enum StateEnum implements IIntegerEnum { OK(0, "成功"), diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/TaskOriginalMessage.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/TaskOriginalMessage.java similarity index 96% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/TaskOriginalMessage.java rename to common-collect/src/main/java/com/docus/server/collect/web/enums/TaskOriginalMessage.java index b46b4d1..78bf67c 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/dao/TaskOriginalMessage.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/TaskOriginalMessage.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.infrastructure.dao; +package com.docus.server.collect.web.enums; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/common-collect/src/main/java/com/docus/server/collect/job/AbstractCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java similarity index 90% rename from common-collect/src/main/java/com/docus/server/collect/job/AbstractCollectJob.java rename to common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java index a037601..9994956 100644 --- a/common-collect/src/main/java/com/docus/server/collect/job/AbstractCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java @@ -1,12 +1,13 @@ -package com.docus.server.collect.job; +package com.docus.server.collect.web.job; import com.docus.core.util.Func; -import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig; -import com.docus.server.collect.service.ITaskConfigService; +import com.docus.server.collect.IJob; +import com.docus.server.collect.web.domain.TaskConfig; +import com.docus.server.collect.web.service.ITaskConfigService; +import com.docus.server.collect.web.utils.PeriodTime; import com.docus.server.record.service.ITBasicService; import com.docus.server.sys.service.IPowerDeptService; import com.docus.server.sys.service.IPowerUserService; -import com.docus.server.tool.PeriodTime; import com.xxl.job.core.context.XxlJobHelper; import org.springframework.beans.factory.annotation.Autowired; diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/ReceiveDeptInfoMapper.java b/common-collect/src/main/java/com/docus/server/collect/web/mapper/ReceiveDeptInfoMapper.java similarity index 60% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/ReceiveDeptInfoMapper.java rename to common-collect/src/main/java/com/docus/server/collect/web/mapper/ReceiveDeptInfoMapper.java index 403816a..15fdf12 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/ReceiveDeptInfoMapper.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/mapper/ReceiveDeptInfoMapper.java @@ -1,7 +1,7 @@ -package com.docus.server.collect.infrastructure.mapper; +package com.docus.server.collect.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.collect.infrastructure.dao.ReceiveDeptInfoEntity; +import com.docus.server.collect.web.enums.ReceiveDeptInfoEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskConfigMapper.java b/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskConfigMapper.java similarity index 58% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskConfigMapper.java rename to common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskConfigMapper.java index 174e4fe..4e3f825 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskConfigMapper.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskConfigMapper.java @@ -1,7 +1,7 @@ -package com.docus.server.collect.infrastructure.mapper; +package com.docus.server.collect.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig; +import com.docus.server.collect.web.domain.TaskConfig; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskOriginalMessageMapper.java b/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java similarity index 66% rename from common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskOriginalMessageMapper.java rename to common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java index fa89679..eaa39a4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/infrastructure/mapper/TaskOriginalMessageMapper.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java @@ -1,7 +1,7 @@ -package com.docus.server.collect.infrastructure.mapper; +package com.docus.server.collect.web.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.docus.server.collect.infrastructure.dao.TaskOriginalMessage; +import com.docus.server.collect.web.enums.TaskOriginalMessage; import org.apache.ibatis.annotations.Mapper; /** diff --git a/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/processor/VisitorProcessor.java similarity index 86% rename from common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java rename to common-collect/src/main/java/com/docus/server/collect/web/processor/VisitorProcessor.java index 225b35b..e3f02c0 100644 --- a/common-collect/src/main/java/com/docus/server/visitor/VisitorProcessor.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/processor/VisitorProcessor.java @@ -1,16 +1,16 @@ -package com.docus.server.visitor; +package com.docus.server.collect.web.processor; import com.docus.core.util.Func; import com.docus.core.util.json.JSON; import com.docus.log.context.TrackContext; import com.docus.log.processor.AbstractProcessor; -import com.docus.server.collect.infrastructure.dao.CollectTypeEnum; -import com.docus.server.collect.infrastructure.dao.StateEnum; -import com.docus.server.collect.infrastructure.enums.IIntegerEnum; -import com.docus.server.tool.SpringUtils; -import com.docus.server.ws.IResult; -import com.docus.server.ws.ITaskOriginalMessageService; -import com.docus.server.ws.convert.IConverter; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.enums.StateEnum; +import com.docus.server.collect.web.enums.IIntegerEnum; +import com.docus.server.collect.web.utils.SpringUtils; +import com.docus.server.collect.IResult; +import com.docus.server.collect.web.service.ITaskOriginalMessageService; +import com.docus.server.collect.IConverter; import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java similarity index 97% rename from common-collect/src/main/java/com/docus/server/collect/service/CollectService.java rename to common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java index 45e4f8c..ae48530 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/CollectService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/CollectService.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.service; +package com.docus.server.collect.web.service; import com.docus.core.util.Func; import com.docus.server.sys.common.pojo.dto.DeptDTO; diff --git a/common-collect/src/main/java/com/docus/server/collect/service/ITaskConfigService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java similarity index 65% rename from common-collect/src/main/java/com/docus/server/collect/service/ITaskConfigService.java rename to common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java index 88b830b..33b84bc 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/ITaskConfigService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java @@ -1,13 +1,12 @@ -package com.docus.server.collect.service; +package com.docus.server.collect.web.service; -import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig; +import com.docus.server.collect.web.domain.TaskConfig; import java.util.Date; public interface ITaskConfigService { void updateAllPointerDate(String id, Date date); - void updateIncPointerDate(String id, Date date); TaskConfig getTaskConfig(String id); diff --git a/common-collect/src/main/java/com/docus/server/ws/ITaskOriginalMessageService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java similarity index 58% rename from common-collect/src/main/java/com/docus/server/ws/ITaskOriginalMessageService.java rename to common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java index 9eca406..f61e1f9 100644 --- a/common-collect/src/main/java/com/docus/server/ws/ITaskOriginalMessageService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java @@ -1,7 +1,7 @@ -package com.docus.server.ws; +package com.docus.server.collect.web.service; -import com.docus.server.collect.infrastructure.dao.CollectTypeEnum; -import com.docus.server.collect.infrastructure.dao.StateEnum; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.enums.StateEnum; public interface ITaskOriginalMessageService { diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/WebServiceServer.java b/common-collect/src/main/java/com/docus/server/collect/web/service/WebServiceServer.java similarity index 89% rename from common-collect/src/main/java/com/docus/server/ws/impl/WebServiceServer.java rename to common-collect/src/main/java/com/docus/server/collect/web/service/WebServiceServer.java index 311e63c..6f57e4f 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/WebServiceServer.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/WebServiceServer.java @@ -1,11 +1,10 @@ -package com.docus.server.ws.impl; - -import com.docus.server.ws.IBasicServer; -import com.docus.server.ws.IDeptServer; -import com.docus.server.ws.IReportServer; -import com.docus.server.ws.IUserServer; -import com.docus.server.ws.IWebServiceServer; -import com.docus.server.ws.WsCollect; +package com.docus.server.collect.web.service; + +import com.docus.server.collect.IWebServiceServer; +import com.docus.server.collect.basic.ws.IBasicServer; +import com.docus.server.collect.dept.ws.IDeptServer; +import com.docus.server.collect.report.ws.IReportServer; +import com.docus.server.collect.user.ws.IUserServer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,29 +22,6 @@ public class WebServiceServer implements IWebServiceServer { private IBasicServer basicService; @Resource private IReportServer reportServer; - @Resource - private WsCollect wsCollect; - -// @Override -// public String receiveHandNumbness(String handNumbness) { -// return wsCollect.receiveHandNumbness(handNumbness); -// } -// -// -// @Override -// public String receiveDept(String deptXml) { -// return wsCollect.receiveDept(deptXml); -// } - - @Override - public String receiveHandNumbness(String handNumbness) { - return null; - } - - @Override - public String receiveDept(String deptXml) { - return null; - } @Override public String deptModify(String receiveDept) { diff --git a/common-collect/src/main/java/com/docus/server/collect/service/impl/TaskConfigServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java similarity index 78% rename from common-collect/src/main/java/com/docus/server/collect/service/impl/TaskConfigServiceImpl.java rename to common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java index ddf6d14..2c51d12 100644 --- a/common-collect/src/main/java/com/docus/server/collect/service/impl/TaskConfigServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java @@ -1,9 +1,9 @@ -package com.docus.server.collect.service.impl; +package com.docus.server.collect.web.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.docus.server.collect.infrastructure.pojo.domain.TaskConfig; -import com.docus.server.collect.infrastructure.mapper.TaskConfigMapper; -import com.docus.server.collect.service.ITaskConfigService; +import com.docus.server.collect.web.domain.TaskConfig; +import com.docus.server.collect.web.mapper.TaskConfigMapper; +import com.docus.server.collect.web.service.ITaskConfigService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/common-collect/src/main/java/com/docus/server/ws/impl/TaskOriginalMessageServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java similarity index 77% rename from common-collect/src/main/java/com/docus/server/ws/impl/TaskOriginalMessageServiceImpl.java rename to common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java index aa09305..63e2947 100644 --- a/common-collect/src/main/java/com/docus/server/ws/impl/TaskOriginalMessageServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java @@ -1,14 +1,14 @@ -package com.docus.server.ws.impl; +package com.docus.server.collect.web.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; -import com.docus.server.collect.infrastructure.dao.CollectTypeEnum; -import com.docus.server.collect.infrastructure.dao.StateEnum; -import com.docus.server.collect.infrastructure.dao.TaskOriginalMessage; -import com.docus.server.collect.infrastructure.mapper.TaskOriginalMessageMapper; -import com.docus.server.ws.ITaskOriginalMessageService; -import com.docus.server.ws.convert.TaskOriginalMessageConverter; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.enums.StateEnum; +import com.docus.server.collect.web.enums.TaskOriginalMessage; +import com.docus.server.collect.web.mapper.TaskOriginalMessageMapper; +import com.docus.server.collect.web.service.ITaskOriginalMessageService; +import com.docus.server.collect.web.convert.TaskOriginalMessageConverter; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/common-collect/src/main/java/com/docus/server/tool/DateSpiltUtil.java b/common-collect/src/main/java/com/docus/server/collect/web/utils/DateSpiltUtil.java similarity index 96% rename from common-collect/src/main/java/com/docus/server/tool/DateSpiltUtil.java rename to common-collect/src/main/java/com/docus/server/collect/web/utils/DateSpiltUtil.java index 676267d..5700c95 100644 --- a/common-collect/src/main/java/com/docus/server/tool/DateSpiltUtil.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/utils/DateSpiltUtil.java @@ -1,4 +1,4 @@ -package com.docus.server.tool; +package com.docus.server.collect.web.utils; import java.util.ArrayList; import java.util.Date; diff --git a/common-collect/src/main/java/com/docus/server/tool/IdUtil.java b/common-collect/src/main/java/com/docus/server/collect/web/utils/IdUtil.java similarity index 90% rename from common-collect/src/main/java/com/docus/server/tool/IdUtil.java rename to common-collect/src/main/java/com/docus/server/collect/web/utils/IdUtil.java index 2592c6b..21309d0 100644 --- a/common-collect/src/main/java/com/docus/server/tool/IdUtil.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/utils/IdUtil.java @@ -1,4 +1,4 @@ -package com.docus.server.tool; +package com.docus.server.collect.web.utils; import lombok.Data; diff --git a/common-collect/src/main/java/com/docus/server/tool/ParamsUtils.java b/common-collect/src/main/java/com/docus/server/collect/web/utils/ParamsUtils.java similarity index 94% rename from common-collect/src/main/java/com/docus/server/tool/ParamsUtils.java rename to common-collect/src/main/java/com/docus/server/collect/web/utils/ParamsUtils.java index 9963be4..3e817bc 100644 --- a/common-collect/src/main/java/com/docus/server/tool/ParamsUtils.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/utils/ParamsUtils.java @@ -1,4 +1,4 @@ -package com.docus.server.tool; +package com.docus.server.collect.web.utils; import java.util.HashMap; import java.util.Map; diff --git a/common-collect/src/main/java/com/docus/server/tool/PeriodTime.java b/common-collect/src/main/java/com/docus/server/collect/web/utils/PeriodTime.java similarity index 90% rename from common-collect/src/main/java/com/docus/server/tool/PeriodTime.java rename to common-collect/src/main/java/com/docus/server/collect/web/utils/PeriodTime.java index d85ea08..b830d5b 100644 --- a/common-collect/src/main/java/com/docus/server/tool/PeriodTime.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/utils/PeriodTime.java @@ -1,4 +1,4 @@ -package com.docus.server.tool; +package com.docus.server.collect.web.utils; import com.docus.core.util.Func; import lombok.AllArgsConstructor; diff --git a/common-collect/src/main/java/com/docus/server/tool/SpringUtils.java b/common-collect/src/main/java/com/docus/server/collect/web/utils/SpringUtils.java similarity index 99% rename from common-collect/src/main/java/com/docus/server/tool/SpringUtils.java rename to common-collect/src/main/java/com/docus/server/collect/web/utils/SpringUtils.java index 029ea19..99d2368 100644 --- a/common-collect/src/main/java/com/docus/server/tool/SpringUtils.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.docus.server.tool; +package com.docus.server.collect.web.utils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; diff --git a/common-collect/src/main/java/com/docus/server/tool/TableJsonRead.java b/common-collect/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java similarity index 99% rename from common-collect/src/main/java/com/docus/server/tool/TableJsonRead.java rename to common-collect/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java index 8811857..cbdd4ad 100644 --- a/common-collect/src/main/java/com/docus/server/tool/TableJsonRead.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/utils/TableJsonRead.java @@ -1,4 +1,4 @@ -package com.docus.server.tool; +package com.docus.server.collect.web.utils; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.util.StringUtils; diff --git a/common-collect/src/main/java/com/docus/server/ws/WsCollect.java b/common-collect/src/main/java/com/docus/server/ws/WsCollect.java deleted file mode 100644 index bf50000..0000000 --- a/common-collect/src/main/java/com/docus/server/ws/WsCollect.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.docus.server.ws; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -@Slf4j -@Component -public class WsCollect { -// @Autowired -// private IMedicalRecordService medicalRecordService; -// @Autowired -// private IParseService parseService; -// @Autowired -// private CollectService collectService; -// @Autowired -// private IWsResult wsResult; -// @Autowired -// private IPowerDeptService powerDeptService; -// -// //接收xml。并且下载病案。 -// public String receiveHandNumbness(String handNumbness) { -// log.info("收到手麻消息：{}", handNumbness); -// try { -// MedicalRecord medicalRecord = parseService.parseHandNumbness(handNumbness); -// medicalRecordService.receive(medicalRecord); -// return wsResult.ok(medicalRecord.getParams()); -// } catch (Exception e) { -// return wsResult.fail(e.getMessage()); -// } -// } -// -// public String receiveDept(String deptXml) { -// log.info("收到科室消息：{}", deptXml); -// try { -// DeptDTO dept = parseService.parseDeptXml(deptXml); -// -// //此处需要存储原xml内容。 -// collectService.receiveDept(dept); -// return wsResult.ok(dept.getParams()); -// } catch (Exception e) { -// return wsResult.fail(e.getMessage(), dept.getParams()); -// } -// } - -} diff --git a/pom.xml b/pom.xml index cdd4282..520f9cc 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ docus-sys docus-medical-record + docus-archivefile his-sysem common-collect collect-sdry