新增主动任务重试监听

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<TBasicDTO> {
      * xxl jobhandler 手工执行
      */
     @XxlJob("startAllTBasicHttpCollect")
+    @TrackRetryListener("startAllTBasicHttpCollect")
     public void startAllTBasicHttpCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -34,6 +36,7 @@ public class TBasicHttpCollectJob extends AbstractCollectJob<TBasicDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
     @XxlJob("startIncTBasicHttpCollect")
+    @TrackRetryListener("startIncTBasicHttpCollect")
     public void startIncTBasicHttpCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<TBasicDTO> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllTBasicViewCollect")
+    @TrackRetryListener("startAllTBasicViewCollect")
     public void startAllTBasicViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -36,6 +38,7 @@ public class TBasicViewCollectJob extends AbstractCollectJob<TBasicDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncTBasicViewCollect")
+    @TrackRetryListener("startIncTBasicViewCollect")
     public void startIncTBasicViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<TBasicDTO> {
      * xxl jobhandler 手工执行
      */
     @XxlJob("startAllTBasicWsCollect")
+    @TrackRetryListener("startAllTBasicWsCollect")
     public void startAllTBasicWsCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -34,6 +36,7 @@ public class TBasicWsCollectJob extends AbstractCollectJob<TBasicDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
     @XxlJob("startIncTBasicWsCollect")
+    @TrackRetryListener("startIncTBasicWsCollect")
     public void startIncTBasicWsCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<DeptDTO> {
      * xxl jobhandler 手工执行
      */
     @XxlJob("startAllDeptHttpCollect")
+    @TrackRetryListener("startAllDeptHttpCollect")
     public void startAllDeptHttpCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -35,6 +37,7 @@ public class DeptHttpCollectJob extends AbstractCollectJob<DeptDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
     @XxlJob("startIncDeptHttpCollect")
+    @TrackRetryListener("startIncDeptHttpCollect")
     public void startIncDeptHttpCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<DeptDTO> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllDeptViewCollect")
+    @TrackRetryListener("startAllDeptViewCollect")
     public void startAllDeptViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -38,6 +40,7 @@ public class DeptViewCollectJob extends AbstractCollectJob<DeptDTO> {
      */
 
     @XxlJob("startIncDeptViewCollect")
+    @TrackRetryListener("startIncDeptViewCollect")
     public void startIncDeptViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<Map<String, Objec
     /**
      * xxl jobhandler 手工执行，全量执行
      */
+    @TrackRetryListener("startAllNoViewCollect")
     @XxlJob("startAllNoViewCollect")
     public void startAllNoViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
@@ -40,6 +42,7 @@ public class DefNoViewCollectionJob extends AbstractCollectJob<Map<String, Objec
     /**
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
+    @TrackRetryListener("startIncNoViewCollect")
     @XxlJob("startIncNoViewCollect")
     public void startIncNoViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));

common-collect/src/main/java/com/docus/server/collect/report/view/BlViewCollectJob.java

@@ -1,13 +1,14 @@
 package com.docus.server.collect.report.view;
 
+import com.docus.log.annotation.TrackRetryListener;
 import com.docus.server.bl.service.IBlService;
 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.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
 
@@ -34,6 +35,7 @@ public class BlViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllBlViewCollect")
+    @TrackRetryListener("startAllBlViewCollect")
     public void startAllBlViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class BlViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncBlViewCollect")
+    @TrackRetryListener("startIncBlViewCollect")
     public void startIncBlViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<Map<String, Object>> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllEcgViewCollect")
+    @TrackRetryListener("startAllEcgViewCollect")
     public void startAllEcgViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class EcgViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncEcgViewCollect")
+    @TrackRetryListener("startIncEcgViewCollect")
     public void startIncEcgViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<Map<String, Object>> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllEmrViewCollect")
+    @TrackRetryListener("startAllEmrViewCollect")
     public void startAllEmrViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class EmrViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncEmrViewCollect")
+    @TrackRetryListener("startIncEmrViewCollect")
     public void startIncEmrViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<Map<String, Object>> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllHlViewCollect")
+    @TrackRetryListener("startAllHlViewCollect")
     public void startAllHlViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class HlViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncHlViewCollect")
+    @TrackRetryListener("startIncHlViewCollect")
     public void startIncHlViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<Map<String, Objec
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllIssubmitViewCollect")
+    @TrackRetryListener("startAllIssubmitViewCollect")
     public void startAllIssubmitViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class IssubmitViewCollectJob extends AbstractCollectJob<Map<String, Objec
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncIssubmitViewCollect")
+    @TrackRetryListener("startIncIssubmitViewCollect")
     public void startIncIssubmitViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

common-collect/src/main/java/com/docus/server/collect/report/view/LisViewCollectJob.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.lis.service.ILisService;
+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 LisViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllLisViewCollect")
+    @TrackRetryListener("startAllLisViewCollect")
     public void startAllLisViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class LisViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncLisViewCollect")
+    @TrackRetryListener("startIncLisViewCollect")
     public void startIncLisViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<Map<String, Object>>
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllPacsViewCollect")
+    @TrackRetryListener("startAllPacsViewCollect")
     public void startAllPacsViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class PacsViewCollectJob extends AbstractCollectJob<Map<String, Object>>
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncPacsViewCollect")
+    @TrackRetryListener("startIncPacsViewCollect")
     public void startIncPacsViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<Map<String, Object>> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllVteViewCollect")
+    @TrackRetryListener("startAllVteViewCollect")
     public void startAllVteViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class VteViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncVteViewCollect")
+    @TrackRetryListener("startIncVteViewCollect")
     public void startIncVteViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<Map<String, Object>> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllZzViewCollect")
+    @TrackRetryListener("startAllZzViewCollect")
     public void startAllZzViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -42,6 +44,7 @@ public class ZzViewCollectJob extends AbstractCollectJob<Map<String, Object>> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncZzViewCollect")
+    @TrackRetryListener("startIncZzViewCollect")
     public void startIncZzViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<UserDTO> {
      * xxl jobhandler 手工执行
      */
     @XxlJob("startAllUserHttpCollect")
+    @TrackRetryListener("startAllUserHttpCollect")
     public void startAllUserHttpCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -34,12 +36,13 @@ public class UserHttpCollectJob extends AbstractCollectJob<UserDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
     @XxlJob("startIncUserHttpCollect")
+    @TrackRetryListener("startIncUserHttpCollect")
     public void startIncUserHttpCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }
 
     @Override
-    public void doHandle(List<UserDTO> results,String param) {
+    public void doHandle(List<UserDTO> results, String param) {
         userService.batchInsertOrUpdatePowerUser(results);
     }
 

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<UserDTO> {
      * xxl jobhandler 手工执行，全量执行
      */
     @XxlJob("startAllUserViewCollect")
+    @TrackRetryListener("startAllUserViewCollect")
     public void startAllUserViewCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -44,6 +46,7 @@ public class UserViewCollectJob extends AbstractCollectJob<UserDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。增量收集
      */
     @XxlJob("startIncUserViewCollect")
+    @TrackRetryListener("startIncUserViewCollect")
     public void startIncUserViewCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

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<UserDTO> {
      * xxl jobhandler 手工执行
      */
     @XxlJob("startAllUserWsCollect")
+    @TrackRetryListener("startAllUserWsCollect")
     public void startAllUserWsCollect(String param) {
         super.startCollectAll(getJobParam(param));
     }
@@ -34,6 +36,7 @@ public class UserWsCollectJob extends AbstractCollectJob<UserDTO> {
      * xxl jobhandler 配置定时启动，如果未完成任务跳过。
      */
     @XxlJob("startIncUserWsCollect")
+    @TrackRetryListener("startIncUserWsCollect")
     public void startIncUserWsCollect(String param) {
         super.startCollectIncrement(getJobParam(param));
     }

common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java

@@ -58,8 +58,6 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
             refreshTaskState(taskConfig);
             throw new RuntimeException(ex);
         }
-
-
     }
 
     @Override
@@ -82,8 +80,6 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
             refreshTaskState(taskConfig);
             throw new RuntimeException(ex);
         }
-
-
     }
 
 

pom.xml

@@ -20,10 +20,6 @@
         <module>docus-client-interface</module>
     </modules>
 
-    <properties>
-        <org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
-    </properties>
-
     <dependencies>
 
         <!--配置中心客户端-->
@@ -124,7 +120,6 @@
         <dependency>
             <groupId>com.docus</groupId>
             <artifactId>docus-excel-starter</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.docus</groupId>
@@ -223,21 +218,21 @@
         </dependency>
 
         <!-- 实体映射转换 start -->
-        <!--        <dependency>-->
-        <!--            <groupId>org.mapstruct</groupId>-->
-        <!--            <artifactId>mapstruct</artifactId>-->
-        <!--            <version>${org.mapstruct.version}</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.mapstruct</groupId>-->
-        <!--            <artifactId>mapstruct-jdk8</artifactId>-->
-        <!--            <version>${org.mapstruct.version}</version>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.mapstruct</groupId>-->
-        <!--            <artifactId>mapstruct-processor</artifactId>-->
-        <!--            <version>${org.mapstruct.version}</version>-->
-        <!--        </dependency>-->
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
         <!-- 实体映射转换 end -->
     </dependencies>