diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java index d0c73e5..ba8d22f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java @@ -1,10 +1,11 @@ package com.docus.server.collect.basic.http; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; +import com.docus.server.entity.TaskConfig; import com.docus.server.record.common.pojo.dto.TBasicDTO; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -26,6 +27,7 @@ public class TBasicHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllTBasicHttpCollect") + @TrackRetryListener("startAllTBasicHttpCollect") public void startAllTBasicHttpCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -34,6 +36,7 @@ public class TBasicHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 配置定时启动,如果未完成任务跳过。 */ @XxlJob("startIncTBasicHttpCollect") + @TrackRetryListener("startIncTBasicHttpCollect") public void startIncTBasicHttpCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java index a916b2a..d54dc70 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java @@ -1,11 +1,12 @@ package com.docus.server.collect.basic.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; +import com.docus.server.entity.TaskConfig; import com.docus.server.his.service.IHisService; import com.docus.server.record.common.pojo.dto.TBasicDTO; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -28,6 +29,7 @@ public class TBasicViewCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllTBasicViewCollect") + @TrackRetryListener("startAllTBasicViewCollect") public void startAllTBasicViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -36,6 +38,7 @@ public class TBasicViewCollectJob extends AbstractCollectJob { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncTBasicViewCollect") + @TrackRetryListener("startIncTBasicViewCollect") public void startIncTBasicViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java index 178169c..819c4e4 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java @@ -1,10 +1,11 @@ package com.docus.server.collect.basic.ws; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; +import com.docus.server.entity.TaskConfig; import com.docus.server.record.common.pojo.dto.TBasicDTO; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -26,6 +27,7 @@ public class TBasicWsCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllTBasicWsCollect") + @TrackRetryListener("startAllTBasicWsCollect") public void startAllTBasicWsCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -34,6 +36,7 @@ public class TBasicWsCollectJob extends AbstractCollectJob { * xxl jobhandler 配置定时启动,如果未完成任务跳过。 */ @XxlJob("startIncTBasicWsCollect") + @TrackRetryListener("startIncTBasicWsCollect") public void startIncTBasicWsCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java index 93392c6..a70933c 100644 --- a/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java @@ -1,10 +1,11 @@ package com.docus.server.collect.dept.http; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; +import com.docus.server.entity.TaskConfig; import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -27,6 +28,7 @@ public class DeptHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllDeptHttpCollect") + @TrackRetryListener("startAllDeptHttpCollect") public void startAllDeptHttpCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -35,6 +37,7 @@ public class DeptHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 配置定时启动,如果未完成任务跳过。 */ @XxlJob("startIncDeptHttpCollect") + @TrackRetryListener("startIncDeptHttpCollect") public void startIncDeptHttpCollect(String param) { super.startCollectIncrement(getJobParam(param)); } 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 13cd0ca..1f89f1b 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 @@ -1,11 +1,12 @@ package com.docus.server.collect.dept.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; +import com.docus.server.entity.TaskConfig; import com.docus.server.his.service.IHisService; import com.docus.server.sys.common.pojo.dto.DeptDTO; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -29,6 +30,7 @@ public class DeptViewCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllDeptViewCollect") + @TrackRetryListener("startAllDeptViewCollect") public void startAllDeptViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -38,6 +40,7 @@ public class DeptViewCollectJob extends AbstractCollectJob { */ @XxlJob("startIncDeptViewCollect") + @TrackRetryListener("startIncDeptViewCollect") public void startIncDeptViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java b/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java index 815bbf1..1f2df7e 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java @@ -1,10 +1,11 @@ package com.docus.server.collect.report.noview; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; +import com.docus.server.entity.TaskConfig; import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -32,6 +33,7 @@ public class DefNoViewCollectionJob extends AbstractCollectJob> { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllBlViewCollect") + @TrackRetryListener("startAllBlViewCollect") public void startAllBlViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -42,6 +44,7 @@ public class BlViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncBlViewCollect") + @TrackRetryListener("startIncBlViewCollect") public void startIncBlViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java index 025e087..6c69003 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EcgViewCollectJob.java @@ -1,13 +1,14 @@ package com.docus.server.collect.report.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.ecg.service.IEcgService; +import com.docus.server.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -34,6 +35,7 @@ public class EcgViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllEcgViewCollect") + @TrackRetryListener("startAllEcgViewCollect") public void startAllEcgViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -42,6 +44,7 @@ public class EcgViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncEcgViewCollect") + @TrackRetryListener("startIncEcgViewCollect") public void startIncEcgViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java index a5dffcd..1c5748f 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/EmrViewCollectJob.java @@ -1,13 +1,14 @@ package com.docus.server.collect.report.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; import com.docus.server.emr.service.IEmrService; +import com.docus.server.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -34,6 +35,7 @@ public class EmrViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllEmrViewCollect") + @TrackRetryListener("startAllEmrViewCollect") public void startAllEmrViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -42,6 +44,7 @@ public class EmrViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncEmrViewCollect") + @TrackRetryListener("startIncEmrViewCollect") public void startIncEmrViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java index ee3af47..1af1965 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/HlViewCollectJob.java @@ -1,13 +1,14 @@ package com.docus.server.collect.report.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; +import com.docus.server.entity.TaskConfig; import com.docus.server.hl.service.IHlService; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -34,6 +35,7 @@ public class HlViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllHlViewCollect") + @TrackRetryListener("startAllHlViewCollect") public void startAllHlViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -42,6 +44,7 @@ public class HlViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncHlViewCollect") + @TrackRetryListener("startIncHlViewCollect") public void startIncHlViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java index 5406d34..8fc82b6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/IssubmitViewCollectJob.java @@ -1,13 +1,14 @@ package com.docus.server.collect.report.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; +import com.docus.server.entity.TaskConfig; import com.docus.server.issubmit.service.IIssubmitService; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -34,6 +35,7 @@ public class IssubmitViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllLisViewCollect") + @TrackRetryListener("startAllLisViewCollect") public void startAllLisViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -42,6 +44,7 @@ public class LisViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncLisViewCollect") + @TrackRetryListener("startIncLisViewCollect") public void startIncLisViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java index 582eabe..696db35 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/PacsViewCollectJob.java @@ -1,13 +1,14 @@ package com.docus.server.collect.report.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; +import com.docus.server.entity.TaskConfig; import com.docus.server.pacs.service.IPacsService; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -34,6 +35,7 @@ public class PacsViewCollectJob extends AbstractCollectJob> * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllPacsViewCollect") + @TrackRetryListener("startAllPacsViewCollect") public void startAllPacsViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -42,6 +44,7 @@ public class PacsViewCollectJob extends AbstractCollectJob> * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncPacsViewCollect") + @TrackRetryListener("startIncPacsViewCollect") public void startIncPacsViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java index e996c7b..dcf9ed3 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/VteViewCollectJob.java @@ -1,12 +1,13 @@ package com.docus.server.collect.report.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; +import com.docus.server.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.docus.server.vte.service.IVteService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -34,6 +35,7 @@ public class VteViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllVteViewCollect") + @TrackRetryListener("startAllVteViewCollect") public void startAllVteViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -42,6 +44,7 @@ public class VteViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncVteViewCollect") + @TrackRetryListener("startIncVteViewCollect") public void startIncVteViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java index 72b3a22..5b94b41 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/view/ZzViewCollectJob.java @@ -1,12 +1,13 @@ package com.docus.server.collect.report.view; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; import com.docus.server.collect.IJob; import com.docus.server.collect.IJobResult; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; import com.docus.server.constants.DSKeyConstants; +import com.docus.server.entity.TaskConfig; +import com.docus.server.util.PeriodTime; import com.docus.server.zz.service.IZzService; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -34,6 +35,7 @@ public class ZzViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllZzViewCollect") + @TrackRetryListener("startAllZzViewCollect") public void startAllZzViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -42,6 +44,7 @@ public class ZzViewCollectJob extends AbstractCollectJob> { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncZzViewCollect") + @TrackRetryListener("startIncZzViewCollect") public void startIncZzViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java index 321c3ae..95b9180 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java @@ -1,10 +1,11 @@ package com.docus.server.collect.user.http; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; +import com.docus.server.entity.TaskConfig; import com.docus.server.sys.common.pojo.dto.UserDTO; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -26,6 +27,7 @@ public class UserHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllUserHttpCollect") + @TrackRetryListener("startAllUserHttpCollect") public void startAllUserHttpCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -34,12 +36,13 @@ public class UserHttpCollectJob extends AbstractCollectJob { * xxl jobhandler 配置定时启动,如果未完成任务跳过。 */ @XxlJob("startIncUserHttpCollect") + @TrackRetryListener("startIncUserHttpCollect") public void startIncUserHttpCollect(String param) { super.startCollectIncrement(getJobParam(param)); } @Override - public void doHandle(List results,String param) { + public void doHandle(List results, String param) { userService.batchInsertOrUpdatePowerUser(results); } diff --git a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java index ee447d1..f45347d 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java @@ -3,15 +3,16 @@ package com.docus.server.collect.user.view; import com.docus.core.util.DateUtil; import com.docus.core.util.Func; import com.docus.core.util.ListUtils; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; +import com.docus.server.entity.TaskConfig; import com.docus.server.his.service.IHisService; import com.docus.server.sys.common.pojo.dto.UserDTO; import com.docus.server.sys.common.pojo.entity.PowerDept; import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; import com.docus.server.sys.common.pojo.entity.PowerUser; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -36,6 +37,7 @@ public class UserViewCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行,全量执行 */ @XxlJob("startAllUserViewCollect") + @TrackRetryListener("startAllUserViewCollect") public void startAllUserViewCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -44,6 +46,7 @@ public class UserViewCollectJob extends AbstractCollectJob { * xxl jobhandler 配置定时启动,如果未完成任务跳过。增量收集 */ @XxlJob("startIncUserViewCollect") + @TrackRetryListener("startIncUserViewCollect") public void startIncUserViewCollect(String param) { super.startCollectIncrement(getJobParam(param)); } diff --git a/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java index f828856..2cf09ba 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java @@ -1,10 +1,11 @@ package com.docus.server.collect.user.ws; +import com.docus.log.annotation.TrackRetryListener; import com.docus.server.collect.ICollector; -import com.docus.server.entity.TaskConfig; import com.docus.server.collect.web.job.AbstractCollectJob; -import com.docus.server.util.PeriodTime; +import com.docus.server.entity.TaskConfig; import com.docus.server.sys.common.pojo.dto.UserDTO; +import com.docus.server.util.PeriodTime; import com.xxl.job.core.handler.annotation.XxlJob; import org.springframework.stereotype.Component; @@ -26,6 +27,7 @@ public class UserWsCollectJob extends AbstractCollectJob { * xxl jobhandler 手工执行 */ @XxlJob("startAllUserWsCollect") + @TrackRetryListener("startAllUserWsCollect") public void startAllUserWsCollect(String param) { super.startCollectAll(getJobParam(param)); } @@ -34,6 +36,7 @@ public class UserWsCollectJob extends AbstractCollectJob { * xxl jobhandler 配置定时启动,如果未完成任务跳过。 */ @XxlJob("startIncUserWsCollect") + @TrackRetryListener("startIncUserWsCollect") public void startIncUserWsCollect(String param) { super.startCollectIncrement(getJobParam(param)); } 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 738cf31..42b5ac4 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 @@ -58,8 +58,6 @@ public abstract class AbstractCollectJob implements IJob { refreshTaskState(taskConfig); throw new RuntimeException(ex); } - - } @Override @@ -82,8 +80,6 @@ public abstract class AbstractCollectJob implements IJob { refreshTaskState(taskConfig); throw new RuntimeException(ex); } - - } diff --git a/pom.xml b/pom.xml index e73ae75..6e4414f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,10 +20,6 @@ docus-client-interface - - 1.3.0.Final - - @@ -124,7 +120,6 @@ com.docus docus-excel-starter - 1.0-SNAPSHOT com.docus @@ -223,21 +218,21 @@ - - - - - - - - - - - - - - - + + org.mapstruct + mapstruct + ${org.mapstruct.version} + + + org.mapstruct + mapstruct-jdk8 + ${org.mapstruct.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} +