新增retry log表

collect-sdry/src/main/java/com/docus/server/collect/basic/http/HttpTBasicCollectorImpl.java

@@ -1,8 +1,8 @@
 package com.docus.server.collect.basic.http;
 
 import com.docus.server.collect.AbstractHttpCollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/basic/ws/WsBasicCollectorImpl.java

@@ -1,8 +1,8 @@
 package com.docus.server.collect.basic.ws;
 
 import com.docus.server.collect.AbstractWsCollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/dept/http/HttpDeptCollectorImpl.java

@@ -1,8 +1,8 @@
 package com.docus.server.collect.dept.http;
 
 import com.docus.server.collect.AbstractHttpCollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/dept/ws/WsDeptCollectorImpl.java

@@ -1,8 +1,8 @@
 package com.docus.server.collect.dept.ws;
 
 import com.docus.server.collect.AbstractWsCollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java

@@ -5,7 +5,7 @@ import com.docus.core.util.Func;
 import com.docus.core.util.ParamsUtils;
 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.archivefile.infrastructure.pojo.dto.ReportDTO;
 import com.docus.server.collect.IConverter;
 import com.docus.server.collect.web.utils.TableJsonRead;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefJobNoViewCollectorImpl.java

@@ -5,9 +5,9 @@ import com.docus.core.util.MapObjUtil;
 import com.docus.core.util.json.JSON;
 import com.docus.server.collect.AbstractJobCollector;
 import com.docus.server.collect.web.common.dto.NoViewCollectionDto;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.enums.QueryWayEnum;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

collect-sdry/src/main/java/com/docus/server/collect/report/noview/DefNoViewJobResultImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.docus.core.util.Func;
 import com.docus.core.util.MapObjUtil;
-import com.docus.server.archivefile.pojo.entity.CollectsysDictionary;
+import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary;
 import com.docus.server.archivefile.service.IAfCollectSysDictionaryService;
 import com.docus.server.collect.web.common.DocusProperties;
 import com.docus.server.collect.web.common.NoViewChNewbornProperties;

collect-sdry/src/main/java/com/docus/server/collect/report/view/AbstractViewJobResultImpl.java

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.docus.core.util.SpringUtils;
 import com.docus.infrastructure.redis.service.IdService;
 import com.docus.server.api.IHospitalApi;
-import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog;
+import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog;
 import com.docus.server.archivefile.service.IAfViewCollectionLogService;
 import com.docus.server.collect.IJobResult;
 import com.docus.server.collect.web.common.BasicProperties;

collect-sdry/src/main/java/com/docus/server/collect/user/http/HttpUserCollectorImpl.java

@@ -1,8 +1,8 @@
 package com.docus.server.collect.user.http;
 
 import com.docus.server.collect.AbstractHttpCollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/user/ws/WsUserCollectorImpl.java

@@ -1,8 +1,8 @@
 package com.docus.server.collect.user.ws;
 
 import com.docus.server.collect.AbstractWsCollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;

collect-sdry/src/main/java/com/docus/server/collect/web/common/dto/CollectionSaveDto.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.web.common.dto;
 
-import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog;
+import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog;
 import lombok.Data;
 
 import java.util.ArrayList;

common-collect/src/main/java/com/docus/server/collect/ICollector.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect;
 
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.util.PeriodTime;
 
 import java.util.List;
 

common-collect/src/main/java/com/docus/server/collect/IJob.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect;
 
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.util.PeriodTime;
 
 public interface IJob<T> {
 

common-collect/src/main/java/com/docus/server/collect/basic/http/TBasicHttpCollectJob.java

@@ -1,9 +1,9 @@
 package com.docus.server.collect.basic.http;
 
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;

common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java

@@ -1,17 +1,20 @@
 package com.docus.server.collect.basic.http.test;
 
 import com.docus.core.util.json.JSON;
+import com.docus.infrastructure.web.api.CommonResult;
+import com.docus.infrastructure.web.response.PageResult;
 import com.docus.log.executor.TrackRetrySpringExecutor;
 import com.docus.log.handler.IJobHandler;
 import com.docus.log.handler.impl.MethodJobHandler;
 import com.docus.server.collect.IConverter;
 import com.docus.server.collect.IHttpResult;
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
 import com.docus.server.collect.web.process.VisitorProcessor;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.collect.web.service.ITaskOriginalMessageService;
+import com.docus.server.archivefile.service.ITaskMessageService;
 import com.docus.server.enums.CollectTypeEnum;
 import com.docus.server.enums.StateEnum;
+import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 
 /**
@@ -39,15 +43,29 @@ public class TestRestController {
     @Resource
     private CollectService collectService;
     @Resource
-    private ITaskOriginalMessageService messageService;
+    private ITaskMessageService messageService;
 
     @ApiOperation("TEST-2")
     @GetMapping("/get2")
     public void get2(String msg) throws Exception {
-        TaskOriginalMessage message = messageService.findByState(StateEnum.FAIL).get(0);
-        IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey());
-        String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName();
-        Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name));
-        jobHandler.execute(o);
+        try {
+            TaskMessage message = messageService.findByState(StateEnum.FAIL).get(0);
+            IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey());
+            String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName();
+            Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name));
+            jobHandler.execute(o);
+        } catch (Exception ex) {
+            System.out.println(ex.getMessage());
+        }
+    }
+
+    @ApiOperation("TEST-3")
+    @GetMapping("/get3")
+    public CommonResult<PageResult<TaskMessage>> get3() throws Exception {
+        PageHelper.startPage(1, 10);
+        List<TaskMessage> list = messageService.findByState(StateEnum.OK);
+        PageResult<TaskMessage> pageResult = new PageResult<>(list);
+
+        return CommonResult.success(pageResult);
     }
 }

common-collect/src/main/java/com/docus/server/collect/basic/view/TBasicViewCollectJob.java

@@ -1,9 +1,9 @@
 package com.docus.server.collect.basic.view;
 
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.his.service.IHisService;
 import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;

common-collect/src/main/java/com/docus/server/collect/basic/ws/TBasicWsCollectJob.java

@@ -1,9 +1,9 @@
 package com.docus.server.collect.basic.ws;
 
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.record.common.pojo.dto.TBasicDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;

common-collect/src/main/java/com/docus/server/collect/dept/http/DeptHttpCollectJob.java

@@ -1,9 +1,9 @@
 package com.docus.server.collect.dept.http;
 
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;

common-collect/src/main/java/com/docus/server/collect/dept/view/DeptViewCollectJob.java

@@ -1,9 +1,9 @@
 package com.docus.server.collect.dept.view;
 
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.his.service.IHisService;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;

common-collect/src/main/java/com/docus/server/collect/dept/ws/DeptWsCollectJob.java

@@ -1,9 +1,9 @@
 package com.docus.server.collect.dept.ws;
 
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.sys.common.pojo.dto.DeptDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;

common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java

@@ -1,6 +1,6 @@
 package com.docus.server.collect.report.event;
 
-import com.docus.server.archivefile.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO;
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;
 

common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java

@@ -6,12 +6,12 @@ import cn.hutool.http.HttpUtil;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.web.api.CommonResult;
 import com.docus.infrastructure.web.api.ResultCode;
-import com.docus.server.archivefile.mapper.AfReportRecordMapper;
-import com.docus.server.archivefile.pojo.dto.ReportDTO;
-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.archivefile.infrastructure.mapper.AfReportRecordMapper;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDownDTO;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDownPatientDTO;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDownScanFileDTO;
+import com.docus.server.archivefile.infrastructure.entity.AfReportRecord;
 import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent;
 import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent;
 import lombok.extern.slf4j.Slf4j;

common-collect/src/main/java/com/docus/server/collect/report/noview/DefNoViewCollectionJob.java

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.noview;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;
 

common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java

@@ -1,7 +1,7 @@
 package com.docus.server.collect.report.service;
 
 
-import com.docus.server.archivefile.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO;
 
 import java.util.List;
 

common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java

@@ -3,11 +3,11 @@ package com.docus.server.collect.report.service.impl;
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
 import com.docus.log.annotation.TrackRetryListener;
-import com.docus.server.archivefile.mapper.AfCollectTaskMapper;
-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.archivefile.infrastructure.mapper.AfCollectTaskMapper;
+import com.docus.server.archivefile.infrastructure.mapper.AfReportRecordMapper;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.infrastructure.entity.AfCollectTask;
+import com.docus.server.archivefile.infrastructure.entity.AfReportRecord;
 import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent;
 import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent;
 import com.docus.server.collect.report.service.IReportService;

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

@@ -4,9 +4,9 @@ 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.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;

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

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.docus.server.ecg.service.IEcgService;
 import com.xxl.job.core.handler.annotation.XxlJob;

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

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.docus.server.emr.service.IEmrService;
 import com.xxl.job.core.handler.annotation.XxlJob;

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

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.docus.server.hl.service.IHlService;
 import com.xxl.job.core.handler.annotation.XxlJob;

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

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.docus.server.issubmit.service.IIssubmitService;
 import com.xxl.job.core.handler.annotation.XxlJob;

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

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.docus.server.lis.service.ILisService;
 import com.xxl.job.core.handler.annotation.XxlJob;

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

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.docus.server.pacs.service.IPacsService;
 import com.xxl.job.core.handler.annotation.XxlJob;

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

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.docus.server.vte.service.IVteService;
 import com.xxl.job.core.handler.annotation.XxlJob;

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

@@ -3,9 +3,9 @@ package com.docus.server.collect.report.view;
 import com.docus.server.collect.ICollector;
 import com.docus.server.collect.IJob;
 import com.docus.server.collect.IJobResult;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.constants.DSKeyConstants;
 import com.docus.server.zz.service.IZzService;
 import com.xxl.job.core.handler.annotation.XxlJob;

common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java

@@ -3,7 +3,7 @@ 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.archivefile.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO;
 import com.docus.server.collect.IConverter;
 import com.docus.server.collect.IWsResult;
 import com.docus.server.collect.report.service.IReportService;

common-collect/src/main/java/com/docus/server/collect/user/http/UserHttpCollectJob.java

@@ -1,9 +1,9 @@
 package com.docus.server.collect.user.http;
 
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;

common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java

@@ -4,9 +4,9 @@ import com.docus.core.util.DateUtil;
 import com.docus.core.util.Func;
 import com.docus.core.util.ListUtils;
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 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;

common-collect/src/main/java/com/docus/server/collect/user/ws/UserWsCollectJob.java

@@ -1,9 +1,9 @@
 package com.docus.server.collect.user.ws;
 
 import com.docus.server.collect.ICollector;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import com.docus.server.collect.web.job.AbstractCollectJob;
-import com.docus.server.collect.web.utils.PeriodTime;
+import com.docus.server.util.PeriodTime;
 import com.docus.server.sys.common.pojo.dto.UserDTO;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.stereotype.Component;

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

@@ -1,8 +1,4 @@
 package com.docus.server.collect.web.common;
 
-/**
- * @author linruifeng
- * @date 2023/6/14 14:10
- */
 public class A {
 }

common-collect/src/main/java/com/docus/server/collect/web/common/pojo/A.java

@@ -0,0 +1,4 @@
+package com.docus.server.collect.web.common.pojo;
+
+public class A {
+}

common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/IdType.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.common.pojo.dto;
+package com.docus.server.collect.web.common.pojo.dto;
 
 public enum IdType {
     /**

common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/InpatientNo.java

@@ -1,4 +1,4 @@
-package com.docus.server.record.common.pojo.dto;
+package com.docus.server.collect.web.common.pojo.dto;
 
 import com.docus.infrastructure.core.exception.BaseException;
 import com.docus.server.record.RecordExceptionEnum;

common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDTO.java

@@ -1,4 +1,4 @@
-package com.docus.server.archivefile.pojo.dto;
+package com.docus.server.collect.web.common.pojo.dto;
 
 import lombok.Data;
 

common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownDTO.java

@@ -1,4 +1,4 @@
-package com.docus.server.archivefile.pojo.dto;
+package com.docus.server.collect.web.common.pojo.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownPatientDTO.java

@@ -1,6 +1,6 @@
-package com.docus.server.archivefile.pojo.dto;
+package com.docus.server.collect.web.common.pojo.dto;
 
-import com.docus.server.archivefile.pojo.entity.AfReportRecord;
+import com.docus.server.collect.web.common.pojo.entity.AfReportRecord;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownScanFileDTO.java

@@ -1,6 +1,6 @@
-package com.docus.server.archivefile.pojo.dto;
+package com.docus.server.collect.web.common.pojo.dto;
 
-import com.docus.server.archivefile.pojo.entity.AfReportRecord;
+import com.docus.server.collect.web.common.pojo.entity.AfReportRecord;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskConfigDao.java

@@ -1,7 +0,0 @@
-package com.docus.server.collect.web.dao;
-
-import com.docus.infrastructure.core.db.dao.IBaseDao;
-import com.docus.server.collect.web.common.entity.TaskConfig;
-
-public interface ITaskConfigDao extends IBaseDao<TaskConfig> {
-}

common-collect/src/main/java/com/docus/server/collect/web/dao/ITaskOriginalMessageDao.java

@@ -1,8 +0,0 @@
-package com.docus.server.collect.web.dao;
-
-
-import com.docus.infrastructure.core.db.dao.IBaseDao;
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
-
-public interface ITaskOriginalMessageDao extends IBaseDao<TaskOriginalMessage> {
-}

common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskConfigDaoImpl.java

@@ -1,14 +0,0 @@
-package com.docus.server.collect.web.dao.impl;
-
-import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.dao.ITaskConfigDao;
-import com.docus.server.collect.web.mapper.TaskConfigMapper;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class TaskConfigDaoImpl extends BaseDaoImpl<TaskConfigMapper, TaskConfig> implements ITaskConfigDao {
-
-
-
-}

common-collect/src/main/java/com/docus/server/collect/web/dao/impl/TaskOriginalMessageDaoImpl.java

@@ -1,11 +0,0 @@
-package com.docus.server.collect.web.dao.impl;
-
-import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
-import com.docus.server.collect.web.dao.ITaskOriginalMessageDao;
-import com.docus.server.collect.web.mapper.TaskOriginalMessageMapper;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class TaskOriginalMessageDaoImpl extends BaseDaoImpl<TaskOriginalMessageMapper, TaskOriginalMessage> implements ITaskOriginalMessageDao {
-}

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

@@ -2,19 +2,19 @@ package com.docus.server.collect.web.job;
 
 import com.docus.core.util.Func;
 import com.docus.infrastructure.redis.service.IdService;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.archivefile.service.ITaskConfigService;
 import com.docus.server.collect.IJob;
-import com.docus.server.collect.web.common.entity.TaskConfig;
 import com.docus.server.collect.web.service.CollectService;
-import com.docus.server.collect.web.service.ITaskConfigService;
-import com.docus.server.collect.web.utils.PeriodTime;
 import com.docus.server.common.config.UserProperties;
 import com.docus.server.enums.StateEnum;
 import com.docus.server.record.service.ITBasicService;
 import com.docus.server.sys.service.IPowerDeptService;
 import com.docus.server.sys.service.IPowerThirdLoginService;
 import com.docus.server.sys.service.IPowerUserService;
+import com.docus.server.util.ExceptionUtils;
+import com.docus.server.util.PeriodTime;
 import com.xxl.job.core.context.XxlJobHelper;
-import jodd.exception.ExceptionUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Resource;
@@ -53,7 +53,7 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
             }
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
-            updateTaskState(getExceptionMessage(ex), taskConfig);
+            updateTaskState(ExceptionUtils.getExceptionMessage(ex), taskConfig);
         }
 
         refreshTaskState(taskConfig);
@@ -74,7 +74,7 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
             }
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
-            updateTaskState(getExceptionMessage(ex), taskConfig);
+            updateTaskState(ExceptionUtils.getExceptionMessage(ex), taskConfig);
         }
 
         refreshTaskState(taskConfig);
@@ -135,13 +135,4 @@ public abstract class AbstractCollectJob<T> implements IJob<T> {
     protected String getJobParam() {
         return XxlJobHelper.getJobParam();
     }
-
-    private String getExceptionMessage(Exception ex) {
-        String lastErrorMsg = ExceptionUtil.exceptionChainToString(ex);
-        if (null != lastErrorMsg && lastErrorMsg.length() > 1000) {
-            return lastErrorMsg.substring(0, 1000);
-        }
-        return lastErrorMsg;
-    }
-
 }

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

@@ -1,7 +1,7 @@
 package com.docus.server.collect.web.job;
 
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
-import com.docus.server.collect.web.service.ITaskOriginalMessageService;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
+import com.docus.server.archivefile.service.ITaskMessageService;
 import com.docus.server.collect.web.service.TrackRetryService;
 import com.docus.server.enums.StateEnum;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -19,15 +19,15 @@ import java.util.List;
 public class TrackRetryJob {
 
     @Resource
-    private ITaskOriginalMessageService messageService;
+    private ITaskMessageService messageService;
     @Resource
     private TrackRetryService trackRetryService;
 
     @XxlJob("trackRetryJob")
     public void retry() throws Exception {
-        List<TaskOriginalMessage> messages = messageService.findByState(StateEnum.FAIL);
+        List<TaskMessage> messages = messageService.findByState(StateEnum.FAIL);
 
-        for (TaskOriginalMessage message : messages) {
+        for (TaskMessage message : messages) {
             trackRetryService.doRetry(message);
         }
     }

common-collect/src/main/java/com/docus/server/collect/web/mapper/TaskOriginalMessageMapper.java

@@ -1,14 +0,0 @@
-package com.docus.server.collect.web.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * Mapper 接口
- * Generated on 2023-06-01
- */
-@Mapper
-public interface TaskOriginalMessageMapper extends BaseMapper<TaskOriginalMessage> {
-
-}

common-collect/src/main/java/com/docus/server/collect/web/process/RetryProcessor.java

@@ -2,7 +2,7 @@ package com.docus.server.collect.web.process;
 
 import com.docus.log.context.TrackContext;
 import com.docus.log.processor.AbstractProcessor;
-import com.docus.server.collect.web.service.ITaskOriginalMessageService;
+import com.docus.server.archivefile.service.ITaskMessageService;
 import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Resource;
@@ -15,7 +15,7 @@ import javax.annotation.Resource;
 @Slf4j
 public class RetryProcessor extends AbstractProcessor {
     @Resource
-    private ITaskOriginalMessageService messageService;
+    private ITaskMessageService messageService;
 
     @Override
     public Object doProcess(TrackContext context) {

common-collect/src/main/java/com/docus/server/collect/web/process/VisitorProcessor.java

@@ -8,7 +8,7 @@ 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.service.ITaskOriginalMessageService;
+import com.docus.server.archivefile.service.ITaskMessageService;
 import com.docus.server.enums.CollectTypeEnum;
 import com.docus.server.enums.StateEnum;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -21,7 +21,7 @@ import java.util.Map;
  */
 @Slf4j
 public class VisitorProcessor extends AbstractProcessor {
-    private ITaskOriginalMessageService messageService;
+    private ITaskMessageService messageService;
     private IConverter converter;
     private IResult result;
 
@@ -37,9 +37,9 @@ public class VisitorProcessor extends AbstractProcessor {
         if (Func.isEmpty(message)) {
             throw new RuntimeException("参数为空");
         }
-        Long taskId = messageService.insertTaskOriginalMessage("", message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup()), retryKey);
+        Long taskId = messageService.insertTaskMessage("", message, IIntegerEnum.fromDisplay(CollectTypeEnum.class, context.getGroup()), retryKey);
         String jsonStr = JSON.toJSON(converter.convert(message, context.getGroup()));
-        messageService.updateTaskOriginalMessage(taskId, jsonStr, context.getExMessageResult(), StateEnum.OK);
+        messageService.updateTaskMessage(taskId, jsonStr, context.getExMessageResult(), StateEnum.OK);
         Map<String, Object> params = context.getParams();
         params.put("taskId", taskId);
         params.put("jsonStr", jsonStr);
@@ -70,7 +70,7 @@ public class VisitorProcessor extends AbstractProcessor {
             } else {
                 log.info("=== AOP 异常通知 ===");
                 log.error((String) params.get("msg"));
-                messageService.updateTaskOriginalMessage(taskId, afterReturnResult, context.getExMessageResult(), StateEnum.FAIL);
+                messageService.updateTaskMessage(taskId, afterReturnResult, context.getExMessageResult(), StateEnum.FAIL);
                 return result.fail(params);
             }
         } catch (Exception e) {
@@ -85,6 +85,6 @@ public class VisitorProcessor extends AbstractProcessor {
     public void initBeans(String[] beanNames) {
         this.converter = (IConverter) SpringUtils.getBean(beanNames[0]);
         this.result = (IResult) SpringUtils.getBean(beanNames[1]);
-        this.messageService = SpringUtils.getBean(ITaskOriginalMessageService.class);
+        this.messageService = SpringUtils.getBean(ITaskMessageService.class);
     }
 }

common-collect/src/main/java/com/docus/server/collect/web/service/ITaskOriginalMessageService.java

@@ -1,17 +0,0 @@
-package com.docus.server.collect.web.service;
-
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
-import com.docus.server.enums.CollectTypeEnum;
-import com.docus.server.enums.StateEnum;
-
-import java.util.List;
-
-public interface ITaskOriginalMessageService {
-
-    Long insertTaskOriginalMessage(String json, String xml, CollectTypeEnum collectType, String retryKey);
-
-    void updateTaskOriginalMessage(Long id, String json, String exMessageResult, StateEnum stateEnum);
-
-    List<TaskOriginalMessage> findByState(StateEnum stateEnum);
-
-}

common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java

@@ -1,27 +1,54 @@
 package com.docus.server.collect.web.service;
 
 import com.docus.core.util.json.JSON;
+import com.docus.infrastructure.redis.service.IdService;
 import com.docus.log.executor.TrackRetrySpringExecutor;
 import com.docus.log.handler.IJobHandler;
 import com.docus.log.handler.impl.MethodJobHandler;
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
+import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog;
+import com.docus.server.enums.StateEnum;
+import com.docus.server.util.ExceptionUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.retry.annotation.Backoff;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 @Service
+@Slf4j
 public class TrackRetryService {
+    @Resource
+    private ITaskMessageRetryLogDao taskMessageRetryLogDao;
+    @Resource
+    private IdService idService;
 
     @Async("recordMessage")
     @Retryable(value = Exception.class, maxAttempts = 3, backoff = @Backoff(delay = 2000L, multiplier = 1.5))
-    public void doRetry(TaskOriginalMessage message) throws Exception {
-        IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey());
-        String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName();
-        Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name));
-        jobHandler.execute(o);
+    public void doRetry(TaskMessage message) throws Exception {
+        TaskMessageRetryLog taskMessageRetryLog = new TaskMessageRetryLog();
+        BeanUtils.copyProperties(message, taskMessageRetryLog);
+        taskMessageRetryLog.setMessageId(message.getId());
+        taskMessageRetryLog.setId(idService.getDateSeq());
+
+        try {
+            IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey());
+            String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName();
+            Object o = JSON.fromJSON(message.getJsonStr(), Class.forName(name));
+            jobHandler.execute(o);
+
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+
+            taskMessageRetryLog.setErrorMsg(ExceptionUtils.getExceptionMessage(e));
+            taskMessageRetryLog.setState(StateEnum.FAIL);
+        }
 
-        //to write retry log
+        taskMessageRetryLogDao.save(taskMessageRetryLog);
     }
 
 }

common-collect/src/main/java/com/docus/server/collect/web/service/impl/A.java

@@ -0,0 +1,4 @@
+package com.docus.server.collect.web.service.impl;
+
+public class A {
+}

common-collect/src/main/java/com/docus/server/collect/web/service/impl/TaskOriginalMessageServiceImpl.java

@@ -1,55 +0,0 @@
-package com.docus.server.collect.web.service.impl;
-
-import com.docus.core.util.DateUtil;
-import com.docus.core.util.Func;
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
-import com.docus.server.collect.web.convert.TaskOriginalMessageConverter;
-import com.docus.server.collect.web.dao.ITaskOriginalMessageDao;
-import com.docus.server.collect.web.service.ITaskOriginalMessageService;
-import com.docus.server.enums.CollectTypeEnum;
-import com.docus.server.enums.StateEnum;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class TaskOriginalMessageServiceImpl implements ITaskOriginalMessageService {
-    @Resource
-    private TaskOriginalMessageConverter converter;
-    @Resource
-    private ITaskOriginalMessageDao taskOriginalMessageDao;
-
-    /**
-     * 新增 ws xml 原始报文
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public Long insertTaskOriginalMessage(String json, String xml, CollectTypeEnum collectType, String retryKey) {
-        TaskOriginalMessage taskOriginalMessage = converter.toConvertTaskOriginalMessageDO(json, xml, collectType, retryKey);
-        taskOriginalMessageDao.save(taskOriginalMessage);
-        return taskOriginalMessage.getId();
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    @Override
-    public void updateTaskOriginalMessage(Long id, String json, String exMessageResult, StateEnum stateEnum) {
-        if (null == id) {
-            return;
-        }
-        TaskOriginalMessage taskOriginalMessage = taskOriginalMessageDao.findById(id);
-        if (Func.isNotEmpty(taskOriginalMessage)) {
-            taskOriginalMessage.setJsonStr(json);
-            taskOriginalMessage.setUpdateTime(DateUtil.now());
-            taskOriginalMessage.setState(stateEnum);
-            taskOriginalMessage.setErrorMsg(exMessageResult);
-            taskOriginalMessageDao.updateById(taskOriginalMessage);
-        }
-    }
-
-    @Override
-    public List<TaskOriginalMessage> findByState(StateEnum stateEnum) {
-        return taskOriginalMessageDao.findBy("state", stateEnum);
-    }
-}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/RecordExceptionEnum.java

@@ -1,4 +1,4 @@
-package com.docus.server.record;
+package com.docus.server.archivefile;
 
 import com.docus.infrastructure.core.exception.IErrorCode;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/convert/TaskMessageConverter.java

@@ -1,8 +1,8 @@
-package com.docus.server.collect.web.convert;
+package com.docus.server.archivefile.convert;
 
 import com.docus.core.util.DateUtil;
 import com.docus.infrastructure.redis.service.IdService;
-import com.docus.server.collect.web.common.entity.TaskOriginalMessage;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
 import com.docus.server.enums.CollectTypeEnum;
 import com.docus.server.enums.StateEnum;
 import org.springframework.stereotype.Component;
@@ -10,12 +10,12 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 @Component
-public class TaskOriginalMessageConverter {
+public class TaskMessageConverter {
     @Resource
     private IdService idService;
 
-    public TaskOriginalMessage toConvertTaskOriginalMessageDO(String json, String xml, CollectTypeEnum collectType, String retryKey) {
-        TaskOriginalMessage taskOriginalMessage = new TaskOriginalMessage();
+    public TaskMessage toConvertTaskOriginalMessageDO(String json, String xml, CollectTypeEnum collectType, String retryKey) {
+        TaskMessage taskOriginalMessage = new TaskMessage();
         taskOriginalMessage.setId(idService.getDateSeq());
         taskOriginalMessage.setName(collectType.name());
         taskOriginalMessage.setMemo(collectType.getDesc());

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/dao/impl/AfCollectSysDictionaryDaoImpl.java

@@ -1,11 +0,0 @@
-package com.docus.server.archivefile.dao.impl;
-
-import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
-import com.docus.server.archivefile.dao.IAfCollectSysDictionaryDao;
-import com.docus.server.archivefile.mapper.AfCollectSysDictionaryMapper;
-import com.docus.server.archivefile.pojo.entity.CollectsysDictionary;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class AfCollectSysDictionaryDaoImpl extends BaseDaoImpl<AfCollectSysDictionaryMapper, CollectsysDictionary> implements IAfCollectSysDictionaryDao {
-}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/cache/TaskCacheLayer.java

@@ -0,0 +1,7 @@
+package com.docus.server.archivefile.infrastructure.cache;
+
+import com.docus.server.annotation.CacheLayer;
+
+@CacheLayer
+public class TaskCacheLayer {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/client/DownLoadAPI.java

@@ -0,0 +1,4 @@
+package com.docus.server.archivefile.infrastructure.client;
+
+public class DownLoadAPI {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/IAfCollectSysDictionaryDao.java

@@ -1,7 +1,7 @@
-package com.docus.server.archivefile.dao;
+package com.docus.server.archivefile.infrastructure.dao;
 
 import com.docus.infrastructure.core.db.dao.IBaseDao;
-import com.docus.server.archivefile.pojo.entity.CollectsysDictionary;
+import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary;
 
 public interface IAfCollectSysDictionaryDao extends IBaseDao<CollectsysDictionary> {
 }

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/IAfViewCollectionLogDao.java

@@ -1,7 +1,7 @@
-package com.docus.server.archivefile.dao;
+package com.docus.server.archivefile.infrastructure.dao;
 
 import com.docus.infrastructure.core.db.dao.IBaseDao;
-import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog;
+import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog;
 
 import java.util.List;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskConfigDao.java

@@ -0,0 +1,7 @@
+package com.docus.server.archivefile.infrastructure.dao;
+
+import com.docus.infrastructure.core.db.dao.IBaseDao;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+
+public interface ITaskConfigDao extends IBaseDao<TaskConfig> {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageDao.java

@@ -0,0 +1,8 @@
+package com.docus.server.archivefile.infrastructure.dao;
+
+
+import com.docus.infrastructure.core.db.dao.IBaseDao;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
+
+public interface ITaskMessageDao extends IBaseDao<TaskMessage> {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/ITaskMessageRetryLogDao.java

@@ -0,0 +1,7 @@
+package com.docus.server.archivefile.infrastructure.dao;
+
+import com.docus.infrastructure.core.db.dao.IBaseDao;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog;
+
+public interface ITaskMessageRetryLogDao extends IBaseDao<TaskMessageRetryLog> {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfCollectSysDictionaryDaoImpl.java

@@ -0,0 +1,11 @@
+package com.docus.server.archivefile.infrastructure.dao.impl;
+
+import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
+import com.docus.server.archivefile.infrastructure.dao.IAfCollectSysDictionaryDao;
+import com.docus.server.archivefile.infrastructure.mapper.AfCollectSysDictionaryMapper;
+import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class AfCollectSysDictionaryDaoImpl extends BaseDaoImpl<AfCollectSysDictionaryMapper, CollectsysDictionary> implements IAfCollectSysDictionaryDao {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/AfViewCollectionLogDaoImpl.java

@@ -1,11 +1,11 @@
-package com.docus.server.archivefile.dao.impl;
+package com.docus.server.archivefile.infrastructure.dao.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
-import com.docus.server.archivefile.dao.IAfViewCollectionLogDao;
-import com.docus.server.archivefile.mapper.AfViewCollectionLogMapper;
-import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog;
+import com.docus.server.archivefile.infrastructure.dao.IAfViewCollectionLogDao;
+import com.docus.server.archivefile.infrastructure.mapper.AfViewCollectionLogMapper;
+import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskConfigDaoImpl.java

@@ -0,0 +1,13 @@
+package com.docus.server.archivefile.infrastructure.dao.impl;
+
+import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
+import com.docus.server.archivefile.infrastructure.dao.ITaskConfigDao;
+import com.docus.server.archivefile.infrastructure.mapper.TaskConfigMapper;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class TaskConfigDaoImpl extends BaseDaoImpl<TaskConfigMapper, TaskConfig> implements ITaskConfigDao {
+
+
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageDaoImpl.java

@@ -0,0 +1,11 @@
+package com.docus.server.archivefile.infrastructure.dao.impl;
+
+import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
+import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao;
+import com.docus.server.archivefile.infrastructure.mapper.TaskMessageMapper;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class TaskMessageDaoImpl extends BaseDaoImpl<TaskMessageMapper, TaskMessage> implements ITaskMessageDao {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dao/impl/TaskMessageRetryLogDaoImpl.java

@@ -0,0 +1,11 @@
+package com.docus.server.archivefile.infrastructure.dao.impl;
+
+import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
+import com.docus.server.archivefile.infrastructure.dao.ITaskMessageRetryLogDao;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog;
+import com.docus.server.archivefile.infrastructure.mapper.TaskMessageRetryLogMapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class TaskMessageRetryLogDaoImpl extends BaseDaoImpl<TaskMessageRetryLogMapper, TaskMessageRetryLog> implements ITaskMessageRetryLogDao {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfCollectTask.java

@@ -1,4 +1,4 @@
-package com.docus.server.archivefile.pojo.entity;
+package com.docus.server.archivefile.infrastructure.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfJobTime.java

@@ -1,4 +1,4 @@
-package com.docus.server.archivefile.pojo.entity;
+package com.docus.server.archivefile.infrastructure.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfReportRecord.java

@@ -1,6 +1,6 @@
-package com.docus.server.archivefile.pojo.entity;
+package com.docus.server.archivefile.infrastructure.entity;
 
-import com.docus.server.archivefile.pojo.dto.ReportDTO;
+import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO;
 import lombok.Data;
 
 import java.io.Serializable;

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfViewCollectionLog.java

@@ -1,4 +1,4 @@
-package com.docus.server.archivefile.pojo.entity;
+package com.docus.server.archivefile.infrastructure.entity;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/CollectsysDictionary.java

@@ -1,4 +1,4 @@
-package com.docus.server.archivefile.pojo.entity;
+package com.docus.server.archivefile.infrastructure.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskConfig.java

@@ -1,9 +1,9 @@
-package com.docus.server.collect.web.common.entity;
+package com.docus.server.archivefile.infrastructure.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.docus.server.collect.web.utils.DateSpiltUtil;
-import com.docus.server.collect.web.utils.PeriodTime;
 import com.docus.server.enums.StateEnum;
+import com.docus.server.util.DateSpiltUtil;
+import com.docus.server.util.PeriodTime;
 import lombok.Data;
 
 import java.util.Date;

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessage.java

@@ -1,4 +1,4 @@
-package com.docus.server.collect.web.common.entity;
+package com.docus.server.archivefile.infrastructure.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -25,9 +25,9 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@TableName("task_original_message")
-@ApiModel(value = "TaskOriginalMessage对象", description = "")
-public class TaskOriginalMessage implements Serializable {
+@TableName("task_message")
+@ApiModel(value = "TaskMessage对象", description = "")
+public class TaskMessage implements Serializable {
 
     @ApiModelProperty(value = "主键")
     @TableId(value = "id", type = IdType.ASSIGN_UUID)

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/TaskMessageRetryLog.java

@@ -0,0 +1,81 @@
+package com.docus.server.archivefile.infrastructure.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.docus.server.enums.CollectTypeEnum;
+import com.docus.server.enums.StateEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * <p>
+ * 被动接收任务表
+ * </p>
+ *
+ * @author AutoGenerator
+ * @since 2023-06-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("task_message_retry_log")
+@ApiModel(value = "TaskMessageRetryLog对象", description = "被动接收任务表")
+public class TaskMessageRetryLog implements Serializable {
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private Long id;
+
+    @ApiModelProperty(value = "重试消息主键")
+    @TableField("message_id")
+    private Long messageId;
+
+    @ApiModelProperty(value = "消息名字")
+    @TableField("name")
+    private String name;
+
+    @ApiModelProperty(value = "消息描述")
+    @TableField("memo")
+    private String memo;
+
+    @ApiModelProperty(value = "消息类型")
+    @TableField("collect_type")
+    private CollectTypeEnum collectType;
+
+    @ApiModelProperty(value = "重试标示")
+    @TableField("retry_key")
+    private String retryKey;
+
+    @ApiModelProperty(value = "原始报文转对象json")
+    @TableField("json_str")
+    private String jsonStr;
+
+    @ApiModelProperty(value = "原始报文")
+    @TableField("source")
+    private String source;
+
+    @ApiModelProperty(value = "状态 0：成功，1:失败")
+    @TableField("state")
+    private StateEnum state = StateEnum.OK;
+
+    @ApiModelProperty(value = "本批次异常信息")
+    @TableField("error_msg")
+    private String errorMsg;
+
+    @ApiModelProperty(value = "入库时间")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "入库更新时间")
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfCollectSysDictionaryMapper.java

@@ -1,7 +1,7 @@
-package com.docus.server.archivefile.mapper;
+package com.docus.server.archivefile.infrastructure.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.docus.server.archivefile.pojo.entity.CollectsysDictionary;
+import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfCollectTaskMapper.java

@@ -1,6 +1,6 @@
-package com.docus.server.archivefile.mapper;
+package com.docus.server.archivefile.infrastructure.mapper;
 
-import com.docus.server.archivefile.pojo.entity.AfCollectTask;
+import com.docus.server.archivefile.infrastructure.entity.AfCollectTask;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfJobTimeMapper.java

@@ -1,6 +1,6 @@
-package com.docus.server.archivefile.mapper;
+package com.docus.server.archivefile.infrastructure.mapper;
 
-import com.docus.server.archivefile.pojo.entity.AfJobTime;
+import com.docus.server.archivefile.infrastructure.entity.AfJobTime;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfReportRecordMapper.java

@@ -1,6 +1,6 @@
-package com.docus.server.archivefile.mapper;
+package com.docus.server.archivefile.infrastructure.mapper;
 
-import com.docus.server.archivefile.pojo.entity.AfReportRecord;
+import com.docus.server.archivefile.infrastructure.entity.AfReportRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/AfViewCollectionLogMapper.java

@@ -1,7 +1,7 @@
-package com.docus.server.archivefile.mapper;
+package com.docus.server.archivefile.infrastructure.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog;
+import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskConfigMapper.java

@@ -1,7 +1,7 @@
-package com.docus.server.collect.web.mapper;
+package com.docus.server.archivefile.infrastructure.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageMapper.java

@@ -0,0 +1,14 @@
+package com.docus.server.archivefile.infrastructure.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Mapper 接口
+ * Generated on 2023-06-01
+ */
+@Mapper
+public interface TaskMessageMapper extends BaseMapper<TaskMessage> {
+
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/mapper/TaskMessageRetryLogMapper.java

@@ -0,0 +1,14 @@
+package com.docus.server.archivefile.infrastructure.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessageRetryLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 被动接收任务表 Mapper 接口
+ * Generated on 2023-06-25
+ */
+@Mapper
+public interface TaskMessageRetryLogMapper extends BaseMapper<TaskMessageRetryLog> {
+
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfCollectSysDictionaryService.java

@@ -1,6 +1,6 @@
 package com.docus.server.archivefile.service;
 
-import com.docus.server.archivefile.pojo.entity.CollectsysDictionary;
+import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary;
 
 import java.util.List;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/IAfViewCollectionLogService.java

@@ -1,6 +1,6 @@
 package com.docus.server.archivefile.service;
 
-import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog;
+import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog;
 
 import java.util.List;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskConfigService.java

@@ -1,6 +1,6 @@
-package com.docus.server.collect.web.service;
+package com.docus.server.archivefile.service;
 
-import com.docus.server.collect.web.common.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
 
 import java.util.Date;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageRetryLogService.java

@@ -0,0 +1,4 @@
+package com.docus.server.archivefile.service;
+
+public interface ITaskMessageRetryLogService {
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/ITaskMessageService.java

@@ -0,0 +1,17 @@
+package com.docus.server.archivefile.service;
+
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
+import com.docus.server.enums.CollectTypeEnum;
+import com.docus.server.enums.StateEnum;
+
+import java.util.List;
+
+public interface ITaskMessageService {
+
+    Long insertTaskMessage(String json, String xml, CollectTypeEnum collectType, String retryKey);
+
+    void updateTaskMessage(Long id, String json, String exMessageResult, StateEnum stateEnum);
+
+    List<TaskMessage> findByState(StateEnum stateEnum);
+
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java

@@ -1,7 +1,7 @@
 package com.docus.server.archivefile.service.impl;
 
-import com.docus.server.archivefile.dao.IAfCollectSysDictionaryDao;
-import com.docus.server.archivefile.pojo.entity.CollectsysDictionary;
+import com.docus.server.archivefile.infrastructure.dao.impl.IAfCollectSysDictionaryDao;
+import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary;
 import com.docus.server.archivefile.service.IAfCollectSysDictionaryService;
 import org.springframework.stereotype.Service;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java

@@ -1,8 +1,8 @@
 package com.docus.server.archivefile.service.impl;
 
 import com.docus.infrastructure.core.db.dao.IBaseDao;
-import com.docus.server.archivefile.dao.IAfViewCollectionLogDao;
-import com.docus.server.archivefile.pojo.entity.AfViewCollectionLog;
+import com.docus.server.archivefile.infrastructure.dao.impl.IAfViewCollectionLogDao;
+import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog;
 import com.docus.server.archivefile.service.IAfViewCollectionLogService;
 import org.springframework.stereotype.Service;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java

@@ -1,8 +1,8 @@
-package com.docus.server.collect.web.service.impl;
+package com.docus.server.archivefile.service.impl;
 
-import com.docus.server.collect.web.common.entity.TaskConfig;
-import com.docus.server.collect.web.dao.ITaskConfigDao;
-import com.docus.server.collect.web.service.ITaskConfigService;
+import com.docus.server.archivefile.infrastructure.entity.TaskConfig;
+import com.docus.server.archivefile.infrastructure.dao.impl.ITaskConfigDao;
+import com.docus.server.archivefile.service.ITaskConfigService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageRetryLogServiceImpl.java

@@ -0,0 +1,17 @@
+package com.docus.server.archivefile.service.impl;
+
+import com.docus.server.archivefile.convert.TaskMessageConverter;
+import com.docus.server.archivefile.infrastructure.dao.ITaskMessageDao;
+import com.docus.server.archivefile.service.ITaskMessageRetryLogService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class TaskMessageRetryLogServiceImpl implements ITaskMessageRetryLogService {
+    @Resource
+    private TaskMessageConverter converter;
+    @Resource
+    private ITaskMessageDao taskMessageDao;
+
+}

common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java

@@ -0,0 +1,55 @@
+package com.docus.server.archivefile.service.impl;
+
+import com.docus.core.util.DateUtil;
+import com.docus.core.util.Func;
+import com.docus.server.archivefile.infrastructure.entity.TaskMessage;
+import com.docus.server.archivefile.convert.TaskMessageConverter;
+import com.docus.server.archivefile.infrastructure.dao.impl.ITaskMessageDao;
+import com.docus.server.archivefile.service.ITaskMessageService;
+import com.docus.server.enums.CollectTypeEnum;
+import com.docus.server.enums.StateEnum;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class TaskMessageServiceImpl implements ITaskMessageService {
+    @Resource
+    private TaskMessageConverter converter;
+    @Resource
+    private ITaskMessageDao taskMessageDao;
+
+    /**
+     * 新增 ws xml 原始报文
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public Long insertTaskMessage(String json, String xml, CollectTypeEnum collectType, String retryKey) {
+        TaskMessage taskOriginalMessage = converter.toConvertTaskOriginalMessageDO(json, xml, collectType, retryKey);
+        taskMessageDao.save(taskOriginalMessage);
+        return taskOriginalMessage.getId();
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateTaskMessage(Long id, String json, String exMessageResult, StateEnum stateEnum) {
+        if (null == id) {
+            return;
+        }
+        TaskMessage taskOriginalMessage = taskMessageDao.findById(id);
+        if (Func.isNotEmpty(taskOriginalMessage)) {
+            taskOriginalMessage.setJsonStr(json);
+            taskOriginalMessage.setUpdateTime(DateUtil.now());
+            taskOriginalMessage.setState(stateEnum);
+            taskOriginalMessage.setErrorMsg(exMessageResult);
+            taskMessageDao.updateById(taskOriginalMessage);
+        }
+    }
+
+    @Override
+    public List<TaskMessage> findByState(StateEnum stateEnum) {
+        return taskMessageDao.findBy("state", stateEnum);
+    }
+}