diff --git a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java index 45609cc..67fc16b 100644 --- a/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java +++ b/collect-sdry/src/main/java/com/docus/server/collect/report/ReportConverter.java @@ -5,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.infrastructure.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.dto.ReportDTO; import com.docus.server.collect.IConverter; import com.docus.server.collect.web.utils.TableJsonRead; import org.springframework.stereotype.Component; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java b/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java index 5fe02a3..755c066 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/event/TaskConsumptionReportDownEvent.java +++ b/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.infrastructure.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.dto.ReportDTO; import lombok.Getter; import org.springframework.context.ApplicationEvent; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java b/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java index 85a0580..ae54efd 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/listener/ReportDownListener.java @@ -6,14 +6,14 @@ 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.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.dto.ReportDTO; import com.docus.server.archivefile.infrastructure.entity.AfReportRecord; +import com.docus.server.archivefile.infrastructure.mapper.AfReportRecordMapper; import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent; import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent; +import com.docus.server.collect.web.common.pojo.dto.ReportDownDTO; +import com.docus.server.collect.web.common.pojo.dto.ReportDownPatientDTO; +import com.docus.server.collect.web.common.pojo.dto.ReportDownScanFileDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java b/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java index 8b56157..dabcff7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/service/IReportService.java +++ b/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.infrastructure.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.dto.ReportDTO; import java.util.List; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java b/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java index beb86a3..952b372 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/service/impl/ReportServiceImpl.java @@ -3,14 +3,14 @@ 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.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.archivefile.infrastructure.mapper.AfCollectTaskMapper; +import com.docus.server.archivefile.infrastructure.mapper.AfReportRecordMapper; import com.docus.server.collect.report.event.TaskConsumptionReportDownEvent; import com.docus.server.collect.report.event.ThreePartyPushReportDownEvent; import com.docus.server.collect.report.service.IReportService; +import com.docus.server.archivefile.infrastructure.dto.ReportDTO; import com.docus.server.record.mapper.TBasicMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; diff --git a/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java index f475b77..3c98571 100644 --- a/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java +++ b/common-collect/src/main/java/com/docus/server/collect/report/ws/impl/ReportServerImpl.java @@ -3,13 +3,13 @@ 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.infrastructure.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.dto.ReportDTO; import com.docus.server.collect.IConverter; import com.docus.server.collect.IWsResult; import com.docus.server.collect.report.service.IReportService; import com.docus.server.collect.report.ws.IReportServer; -import com.docus.server.enums.CollectTypeEnum; import com.docus.server.collect.web.process.VisitorProcessor; +import com.docus.server.enums.CollectTypeEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownPatientDTO.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownPatientDTO.java index 07af860..af195b0 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownPatientDTO.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownPatientDTO.java @@ -1,6 +1,7 @@ package com.docus.server.collect.web.common.pojo.dto; -import com.docus.server.collect.web.common.pojo.entity.AfReportRecord; +import com.docus.server.archivefile.infrastructure.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.entity.AfReportRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownScanFileDTO.java b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownScanFileDTO.java index 5777de2..f843194 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownScanFileDTO.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDownScanFileDTO.java @@ -1,6 +1,7 @@ package com.docus.server.collect.web.common.pojo.dto; -import com.docus.server.collect.web.common.pojo.entity.AfReportRecord; +import com.docus.server.archivefile.infrastructure.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.entity.AfReportRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java b/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java index 077bb21..0b55e39 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/service/TrackRetryService.java @@ -1,5 +1,6 @@ package com.docus.server.collect.web.service; +import com.docus.core.util.DateUtil; import com.docus.core.util.json.JSON; import com.docus.infrastructure.redis.service.IdService; import com.docus.log.executor.TrackRetrySpringExecutor; @@ -56,6 +57,8 @@ public class TrackRetryService { BeanUtils.copyProperties(message, taskMessageRetryLog); taskMessageRetryLog.setMessageId(message.getId()); taskMessageRetryLog.setId(idService.getDateSeq()); + taskMessageRetryLog.setCreateTime(DateUtil.now()); + taskMessageRetryLog.setUpdateTime(DateUtil.now()); return taskMessageRetryLog; } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDTO.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dto/ReportDTO.java similarity index 95% rename from common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDTO.java rename to common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dto/ReportDTO.java index ac7d228..f58fdfc 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/pojo/dto/ReportDTO.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/dto/ReportDTO.java @@ -1,4 +1,4 @@ -package com.docus.server.collect.web.common.pojo.dto; +package com.docus.server.archivefile.infrastructure.dto; import lombok.Data; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfReportRecord.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfReportRecord.java index 9ef3f42..70581df 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfReportRecord.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/infrastructure/entity/AfReportRecord.java @@ -1,6 +1,6 @@ package com.docus.server.archivefile.infrastructure.entity; -import com.docus.server.archivefile.infrastructure.pojo.dto.ReportDTO; +import com.docus.server.archivefile.infrastructure.dto.ReportDTO; import lombok.Data; import java.io.Serializable; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java index f610ff9..faa1778 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfCollectSysDictionaryImpl.java @@ -1,6 +1,6 @@ package com.docus.server.archivefile.service.impl; -import com.docus.server.archivefile.infrastructure.dao.impl.IAfCollectSysDictionaryDao; +import com.docus.server.archivefile.infrastructure.dao.IAfCollectSysDictionaryDao; import com.docus.server.archivefile.infrastructure.entity.CollectsysDictionary; import com.docus.server.archivefile.service.IAfCollectSysDictionaryService; import org.springframework.stereotype.Service; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java index dd296e2..a6bfe47 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/AfViewCollectionLogServiceImpl.java @@ -1,7 +1,7 @@ package com.docus.server.archivefile.service.impl; import com.docus.infrastructure.core.db.dao.IBaseDao; -import com.docus.server.archivefile.infrastructure.dao.impl.IAfViewCollectionLogDao; +import com.docus.server.archivefile.infrastructure.dao.IAfViewCollectionLogDao; import com.docus.server.archivefile.infrastructure.entity.AfViewCollectionLog; import com.docus.server.archivefile.service.IAfViewCollectionLogService; import org.springframework.stereotype.Service; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java index f6f244d..d1291d5 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskConfigServiceImpl.java @@ -1,7 +1,7 @@ package com.docus.server.archivefile.service.impl; +import com.docus.server.archivefile.infrastructure.dao.ITaskConfigDao; 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; diff --git a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java index 3429ac0..9211982 100644 --- a/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java +++ b/common-docus/docus-archivefile/src/main/java/com/docus/server/archivefile/service/impl/TaskMessageServiceImpl.java @@ -2,9 +2,9 @@ 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.infrastructure.dao.ITaskMessageDao; +import com.docus.server.archivefile.infrastructure.entity.TaskMessage; import com.docus.server.archivefile.service.ITaskMessageService; import com.docus.server.enums.CollectTypeEnum; import com.docus.server.enums.StateEnum; diff --git a/docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java b/docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java index c0bc7d2..786955e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java +++ b/docus-client-interface/src/main/java/com/docus/server/util/ExceptionUtils.java @@ -1,11 +1,15 @@ package com.docus.server.util; -import jodd.exception.ExceptionUtil; +import java.io.PrintWriter; +import java.io.StringWriter; public class ExceptionUtils { public static String getExceptionMessage(Throwable ex) { - String errorMessage = ExceptionUtil.exceptionChainToString(ex); + StringWriter stringWriter = new StringWriter(); + ex.printStackTrace(new PrintWriter(stringWriter)); + String errorMessage = stringWriter.toString(); + if (null != errorMessage && errorMessage.length() > 1000) { return errorMessage.substring(0, 1000); }