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 4237031..af82783 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 @@ -3,7 +3,7 @@ package com.docus.server.collect.basic.http; import com.docus.infrastructure.web.api.CommonResult; import com.docus.log.context.TrackContext; import com.docus.server.collect.IHttpResult; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import org.springframework.stereotype.Component; import java.util.Map; 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 5071820..2e805e8 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 @@ -3,7 +3,7 @@ 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.collect.web.process.VisitorProcessor; import com.docus.server.record.pojo.dto.TBasicDTO; import com.docus.server.collect.IConverter; 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 50c81ca..ab4d474 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 @@ -5,7 +5,7 @@ import com.docus.core.util.Func; import com.docus.log.context.TrackContext; import com.docus.server.collect.basic.ws.impl.BasicServerImpl; import com.docus.server.collect.IWsResult; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import org.springframework.stereotype.Component; import java.util.Date; 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 03f6bde..99feafa 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 @@ -3,7 +3,7 @@ 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.collect.web.process.VisitorProcessor; import com.docus.server.record.pojo.dto.TBasicDTO; import com.docus.server.collect.IConverter; import org.springframework.stereotype.Component; diff --git a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/MQTestRestController.java b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/MQTestRestController.java index cba76e5..ee86a51 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/MQTestRestController.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/user/mq/test/MQTestRestController.java @@ -3,7 +3,7 @@ package com.docus.server.collect.user.mq.test; 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.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java index fd4eb50..6613795 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/BasicRestController.java @@ -7,7 +7,7 @@ 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.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.record.pojo.dto.TBasicDTO; import io.swagger.annotations.Api; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java index 28b5044..3b6cb21 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicJmsMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.basic.mq.IBasicMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.record.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java index 576a5e1..9d18150 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRabbitMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.basic.mq.IBasicMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.record.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java index 013da84..a8713da 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/mq/impl/BasicRocketMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.basic.mq.IBasicMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.record.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; @@ -51,4 +51,4 @@ public class BasicRocketMqCollectServiceImpl implements IBasicMqCollectService { public TBasicDTO getValue() { return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), TBasicDTO.class); } -} \ No newline at end of file +} diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java index 17309ff..8ca5be0 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/impl/BasicServerImpl.java @@ -7,7 +7,7 @@ import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; import com.docus.server.collect.basic.ws.IBasicServer; import com.docus.server.collect.web.enums.CollectTypeEnum; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.record.pojo.dto.TBasicDTO; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java index 20c0f74..a42caef 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptRestController.java @@ -9,7 +9,7 @@ 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.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptJmsMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptJmsMqCollectServiceImpl.java index 2ea1f42..bf6d3fd 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptJmsMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptJmsMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.dept.mq.IDeptMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptRabbitMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptRabbitMqCollectServiceImpl.java index a77d308..ffdf546 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptRabbitMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptRabbitMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.dept.mq.IDeptMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptRocketMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptRocketMqCollectServiceImpl.java index 115e740..e29490f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptRocketMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/mq/impl/DeptRocketMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.dept.mq.IDeptMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import lombok.extern.slf4j.Slf4j; @@ -52,4 +52,4 @@ public class DeptRocketMqCollectServiceImpl implements IDeptMqCollectService { public DeptDTO getValue() { return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), DeptDTO.class); } -} \ No newline at end of file +} diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java index c730bd6..4a18afa 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java @@ -2,6 +2,7 @@ package com.docus.server.collect.dept.view; import com.docus.server.collect.ICollector; import com.docus.server.collect.web.job.AbstractCollectJob; +import com.docus.server.collect.web.service.CollectService; import com.docus.server.his.service.IHisService; import com.docus.server.sys.common.pojo.dto.DeptDTO; import com.xxl.job.core.handler.annotation.XxlJob; @@ -22,6 +23,8 @@ import java.util.List; public class DeptViewCollectJob extends AbstractCollectJob { @Resource private IHisService hisService; + @Resource + private CollectService collectService; /** * xxl jobhandler 手工执行,全量执行 @@ -34,6 +37,7 @@ public class DeptViewCollectJob extends AbstractCollectJob { /** * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ + @XxlJob("startIncDeptViewCollect") public void startIncDeptViewCollect() { super.startCollectIncrement(getJobParam()); diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java index 57c026f..9dc8939 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/ws/impl/DeptServerImpl.java @@ -8,7 +8,7 @@ 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.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.dept.ws.IDeptServer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java index e513c54..637d9c1 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java @@ -7,7 +7,7 @@ import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; import com.docus.server.archivefile.pojo.dto.ReportDTO; import com.docus.server.collect.web.enums.CollectTypeEnum; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.report.ws.IReportServer; import com.docus.server.collect.report.service.IReportService; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java b/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java index aa50cd3..22a2b20 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/http/UserRestController.java @@ -7,7 +7,7 @@ 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.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; import io.swagger.annotations.Api; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserJmsMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserJmsMqCollectServiceImpl.java index 3a17294..b3d1d19 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserJmsMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserJmsMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.user.mq.IUserMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserRabbitMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserRabbitMqCollectServiceImpl.java index e5ca814..38cd1f4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserRabbitMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserRabbitMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.user.mq.IUserMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserRocketMqCollectServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserRocketMqCollectServiceImpl.java index 946f460..66f4081 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserRocketMqCollectServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/mq/impl/UserRocketMqCollectServiceImpl.java @@ -4,7 +4,7 @@ import com.docus.core.util.json.JSON; import com.docus.log.annotation.TrackGroup; import com.docus.log.context.TrackHelper; import com.docus.server.collect.user.mq.IUserMqCollectService; -import com.docus.server.collect.web.processor.VisitorProcessor; +import com.docus.server.collect.web.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.extern.slf4j.Slf4j; @@ -51,4 +51,4 @@ public class UserRocketMqCollectServiceImpl implements IUserMqCollectService { public UserDTO getValue() { return JSON.fromJSON((String) TrackHelper.getValue("jsonStr"), UserDTO.class); } -} \ No newline at end of file +} diff --git a/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java index b9ed498..73744e9 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/impl/UserServerImpl.java @@ -7,7 +7,7 @@ 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.process.VisitorProcessor; import com.docus.server.collect.web.service.CollectService; import com.docus.server.sys.common.pojo.dto.UserDTO; import lombok.extern.slf4j.Slf4j; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java b/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java index 284fcd8..9693656 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/convert/TaskOriginalMessageConverter.java @@ -14,7 +14,7 @@ public class TaskOriginalMessageConverter { @Resource private IdService idService; - public TaskOriginalMessage toConvertTaskOriginalMessageDO(Object json, String xml, CollectTypeEnum collectType) { + public TaskOriginalMessage toConvertTaskOriginalMessageDO(String json, String xml, CollectTypeEnum collectType) { TaskOriginalMessage taskOriginalMessage = new TaskOriginalMessage(); taskOriginalMessage.setId(idService.getDateSeq()); taskOriginalMessage.setName(collectType.name()); diff --git a/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java b/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java index 41cc98a..61e23a5 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/domain/TaskConfig.java @@ -1,5 +1,6 @@ package com.docus.server.collect.web.domain; +import com.docus.server.collect.web.enums.StateEnum; import com.docus.server.collect.web.utils.DateSpiltUtil; import com.docus.server.collect.web.utils.PeriodTime; import lombok.Data; @@ -58,6 +59,15 @@ public class TaskConfig { */ private Date incPointerTime; + /** + * 执行状态 + */ + private StateEnum state = StateEnum.OK; + + /** + * 失败信息 + */ + private String errorMsg; public List getAllPeriodTimes() { List periodTimes = DateSpiltUtil.spiltDate(this.getStartTime(), this.endTime, 1000 * spiltPeriod); diff --git a/common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java index 08414c9..e50d6fc 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/CollectTypeEnum.java @@ -45,6 +45,19 @@ public enum CollectTypeEnum implements IIntegerEnum { RABBIT_MQ_PASSIVE_UPDATE_DEPT(26, "RABBIT_MQ_PASSIVE_UPDATE_DEPT", "修改-科室信息"), RABBIT_MQ_PASSIVE_INSERT_BASIC(27, "RABBIT_MQ_PASSIVE_INSERT_BASIC", "新增-基础数据"), RABBIT_MQ_PASSIVE_UPDATE_BASIC(28, "RABBIT_MQ_PASSIVE_UPDATE_BASIC", "修改-基础数据"), + + /** + * JOB + */ + JOB_VIEW_DEPT(29, "JOB_VIEW_DEPT", "新增/修改-科室信息"), + JOB_USER(30, "JOB_USER", "新增/修改-用户信息"), + JOB_INSERT_BASIC(31, "JOB_INSERT_BASIC", "新增/修改-基础数据"), + JOB_UPDATE_BASIC(32, "JOB_UPDATE_BASIC", "新增/修改-基础数据"), + JOB_SA_REPORT(33, "JOB_SA_REPORT", "新增-手麻报告信息"), + JOB_ICU_REPORT(34, "JOB_ICU_REPORT", "新增-重症报告信息"), + JOB_REPORT(35, "JOB_REPORT", "新增-检验报告信息"), + JOB_INSERT_REPORT(36, "JOB_INSERT_REPORT", "新增-检查报告的信息"), + JOB_UPDATE_REPORT(37, "JOB_UPDATE_REPORT", "更新-检查报告的信息"), ; private Integer value; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/enums/TaskOriginalMessage.java b/common-collect/src/main/java/com/docus/server/collect/web/enums/TaskOriginalMessage.java index 78bf67c..4cdb55f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/enums/TaskOriginalMessage.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/enums/TaskOriginalMessage.java @@ -45,7 +45,7 @@ public class TaskOriginalMessage implements Serializable { @ApiModelProperty(value = "原始报文转对象json") @TableField("json_str") - private Object jsonStr; + private String jsonStr; @ApiModelProperty(value = "原始报文") @TableField("source") @@ -55,6 +55,10 @@ public class TaskOriginalMessage implements Serializable { @TableField("state") private StateEnum state; + @ApiModelProperty(value = "本批次异常信息") + @TableField("error_msg") + private String errorMsg; + @ApiModelProperty(value = "入库时间") @TableField("create_time") private Date createTime; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java index a683a1e..f82c179 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java @@ -3,6 +3,7 @@ package com.docus.server.collect.web.job; import com.docus.core.util.Func; import com.docus.server.collect.IJob; import com.docus.server.collect.web.domain.TaskConfig; +import com.docus.server.collect.web.enums.StateEnum; import com.docus.server.collect.web.service.ITaskConfigService; import com.docus.server.collect.web.utils.PeriodTime; import com.docus.server.record.service.ITBasicService; @@ -27,25 +28,34 @@ public abstract class AbstractCollectJob implements IJob { @Override public void startCollectAll(String taskConfigId) { - TaskConfig taskConfig = taskConfigService.getTaskConfig(taskConfigId); + TaskConfig taskConfig = getTaskConfig(taskConfigId); - List periodTimes = taskConfig.getAllPeriodTimes(); - for (PeriodTime periodTime : periodTimes) { - get(periodTime, taskConfig); - taskConfigService.updateAllPointerDate(taskConfigId, periodTime.getPeriodEndDate()); + try { + List periodTimes = taskConfig.getAllPeriodTimes(); + for (PeriodTime periodTime : periodTimes) { + get(periodTime, taskConfig); + taskConfigService.updateAllPointerDate(taskConfigId, periodTime.getPeriodEndDate()); + } + } catch (Exception ex) { + updateTaskState(ex, taskConfig); } } + @Override public void startCollectIncrement(String taskConfigId) { TaskConfig taskConfig = taskConfigService.getTaskConfig(taskConfigId); + try { - List periodTimes = taskConfig.getIncPeriodTimes(); - periodTimes.forEach(periodTime -> { - get(periodTime, taskConfig); - taskConfigService.updateIncPointerDate(taskConfigId, periodTime.getPeriodEndDate()); - }); + List periodTimes = taskConfig.getIncPeriodTimes(); + periodTimes.forEach(periodTime -> { + get(periodTime, taskConfig); + taskConfigService.updateIncPointerDate(taskConfigId, periodTime.getPeriodEndDate()); + }); + } catch (Exception ex) { + updateTaskState(ex, taskConfig); + } } @Override @@ -68,6 +78,17 @@ public abstract class AbstractCollectJob implements IJob { } } + private void updateTaskState(Exception ex, TaskConfig taskConfig) { + taskConfig.setState(StateEnum.FAIL); + String message = ex.getMessage(); + taskConfig.setErrorMsg(message.length() > 500 ? message.substring(0, 500) : message); + taskConfigService.updateByTaskId(taskConfig); + } + + private TaskConfig getTaskConfig(String taskConfigId) { + return taskConfigService.getTaskConfig(taskConfigId); + } + protected String getJobParam() { return XxlJobHelper.getJobParam(); } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/process/JobProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/process/JobProcessor.java new file mode 100644 index 0000000..947ab4c --- /dev/null +++ b/common-collect/src/main/java/com/docus/server/collect/web/process/JobProcessor.java @@ -0,0 +1,91 @@ +package com.docus.server.collect.web.process; + +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.IConverter; +import com.docus.server.collect.IResult; +import com.docus.server.collect.web.enums.CollectTypeEnum; +import com.docus.server.collect.web.enums.IIntegerEnum; +import com.docus.server.collect.web.enums.StateEnum; +import com.docus.server.collect.web.service.ITaskOriginalMessageService; +import com.docus.server.collect.web.utils.SpringUtils; +import com.fasterxml.jackson.core.type.TypeReference; +import com.xxl.job.core.context.XxlJobHelper; +import lombok.extern.slf4j.Slf4j; + +import java.util.Map; + +/** + * @author linruifeng + */ +@Slf4j +public class JobProcessor extends AbstractProcessor { + private ITaskOriginalMessageService messageService; + private IConverter converter; + private IResult result; + + /** + * 前置通知 + */ + @Override + public Object beforeProcess(TrackContext context) { + super.beforeProcess(context); + initBeans(context.getBeanNames()); + String message = XxlJobHelper.getJobParam(); + context.setArgs(new Object[]{message}); + if (Func.isEmpty(message)) { + throw new RuntimeException("参数为空"); + } +// String jsonStr = JSON.toJSON(converter.convert(message, context.getGroup())); + Long taskId = messageService.insertTaskOriginalMessage("", message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup())); + Map params = context.getParams(); + params.put("taskId", taskId); +// params.put("jsonStr", jsonStr); + params.put("group", context.getGroup()); + return null; + } + + /** + * 后置和异常通知 + */ + @Override + public Object doProcess(TrackContext context) { + Map params = context.getParams(); + try { + Long taskId = (Long) params.get("taskId"); + String afterReturnResult = (String) params.get("jsonStr"); + params.put("msg", context.getExMessageResult()); + + if (Func.isNotEmpty(afterReturnResult)) { + params.putAll(JSON.fromJSONWithGeneric(afterReturnResult, new TypeReference>() { + })); + } + + if (!context.isError()) { + log.info("=== AOP 后置通知 ==="); + params.put("msg", "操作成功!"); + messageService.updateTaskOriginalMessage(taskId, afterReturnResult, context.getExMessageResult(), StateEnum.OK); + return result.ok(params); + } else { + log.info("=== AOP 异常通知 ==="); + log.error((String) params.get(context.getExMessageResult())); + messageService.updateTaskOriginalMessage(taskId, afterReturnResult, context.getExMessageResult(), StateEnum.FAIL); + return result.fail(params); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + return result.fail(params); + } + } + + /** + * 初始化bean + */ + private void initBeans(String[] beanNames) { +// this.converter = (IConverter) SpringUtils.getBean(beanNames[0]); +// this.result = (IResult) SpringUtils.getBean(beanNames[1]); + this.messageService = SpringUtils.getBean(ITaskOriginalMessageService.class); + } +} diff --git a/common-collect/src/main/java/com/docus/server/collect/web/processor/VisitorProcessor.java b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java similarity index 89% rename from common-collect/src/main/java/com/docus/server/collect/web/processor/VisitorProcessor.java rename to common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java index 620ae8c..2b62996 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/processor/VisitorProcessor.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.web.processor; +package com.docus.server.collect.web.process; import com.docus.core.util.Func; import com.docus.core.util.json.JSON; @@ -36,8 +36,9 @@ public class VisitorProcessor extends AbstractProcessor { if (Func.isEmpty(message)) { throw new RuntimeException("参数为空"); } + Long taskId = messageService.insertTaskOriginalMessage("", message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup())); String jsonStr = JSON.toJSON(converter.convert(message, context.getGroup())); - Long taskId = messageService.insertTaskOriginalMessage(jsonStr, message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup())); + messageService.updateTaskOriginalMessage(taskId, jsonStr, context.getExMessageResult(), StateEnum.OK); Map params = context.getParams(); params.put("taskId", taskId); params.put("jsonStr", jsonStr); @@ -68,7 +69,7 @@ public class VisitorProcessor extends AbstractProcessor { } else { log.info("=== AOP 异常通知 ==="); log.error((String) params.get(context.getExMessageResult())); - messageService.updateTaskOriginalMessage(taskId, afterReturnResult, StateEnum.FAIL); + messageService.updateTaskOriginalMessage(taskId, afterReturnResult, context.getExMessageResult(), StateEnum.FAIL); return result.fail(params); } } catch (Exception e) { diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java index 33b84bc..9db4355 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskConfigService.java @@ -10,4 +10,6 @@ public interface ITaskConfigService { void updateIncPointerDate(String id, Date date); TaskConfig getTaskConfig(String id); + + void updateByTaskId(TaskConfig taskConfig); } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java index f61e1f9..6f375a3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java @@ -5,7 +5,7 @@ import com.docus.server.collect.web.enums.StateEnum; public interface ITaskOriginalMessageService { - Long insertTaskOriginalMessage(Object json, String xml, CollectTypeEnum collectType); + Long insertTaskOriginalMessage(String json, String xml, CollectTypeEnum collectType); - void updateTaskOriginalMessage(Long id, Object json, StateEnum stateEnum); + void updateTaskOriginalMessage(Long id, String json, String exMessageResult, StateEnum stateEnum); } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java index 2c51d12..69875d4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskConfigServiceImpl.java @@ -33,4 +33,10 @@ public class TaskConfigServiceImpl extends ServiceImpl 500 ? exMessageResult.substring(0, 500) : exMessageResult); super.updateById(taskOriginalMessage); } }