From 027d21d849a999244ab14c90b840fc45a24290ba Mon Sep 17 00:00:00 2001
From: beeajax <1105173470@qq.com>
Date: Sun, 25 Jun 2023 10:27:26 +0800
Subject: [PATCH] org.mapstruct

---
 .../web/service/TrackRetryService.java        | 24 ++++++++++++-------
 .../dao/impl/PowerUserDaoImpl.java            |  2 ++
 pom.xml                                       | 18 ++++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

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 1ab7ef1..077bb21 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
@@ -30,25 +30,33 @@ public class TrackRetryService {
     @Async("recordMessage")
     @Retryable(value = Exception.class, maxAttempts = 3, backoff = @Backoff(delay = 2000L, multiplier = 1.5))
     public void doRetry(TaskMessage message) throws Exception {
-        TaskMessageRetryLog taskMessageRetryLog = new TaskMessageRetryLog();
-        BeanUtils.copyProperties(message, taskMessageRetryLog);
-        taskMessageRetryLog.setMessageId(message.getId());
-        taskMessageRetryLog.setId(idService.getDateSeq());
+
+        TaskMessageRetryLog taskMessageRetryLog = beforeProcess(message);
 
         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);
+            afterThrowingProcess(ExceptionUtils.getExceptionMessage(e), taskMessageRetryLog);
         }
 
         taskMessageRetryLogDao.save(taskMessageRetryLog);
     }
 
+    private void afterThrowingProcess(String errorMsg, TaskMessageRetryLog taskMessageRetryLog) {
+        taskMessageRetryLog.setErrorMsg(errorMsg);
+        taskMessageRetryLog.setState(StateEnum.FAIL);
+    }
+
+    private TaskMessageRetryLog beforeProcess(TaskMessage message) {
+        TaskMessageRetryLog taskMessageRetryLog = new TaskMessageRetryLog();
+        BeanUtils.copyProperties(message, taskMessageRetryLog);
+        taskMessageRetryLog.setMessageId(message.getId());
+        taskMessageRetryLog.setId(idService.getDateSeq());
+        return taskMessageRetryLog;
+    }
+
 }
diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerUserDaoImpl.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerUserDaoImpl.java
index bd9c620..e00a2f4 100644
--- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerUserDaoImpl.java
+++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/infrastructure/dao/impl/PowerUserDaoImpl.java
@@ -29,4 +29,6 @@ public class PowerUserDaoImpl extends BaseDaoImpl<PowerUserMapper, PowerUser> im
     public void delUserByUserName(String userName) {
         baseMapper.delUserByUserName(userName);
     }
+
+
 }
diff --git a/pom.xml b/pom.xml
index a765a29..e8e506f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,24 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
+
+        <!-- 实体映射转换 start -->
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>1.3.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+            <version>1.3.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>1.3.0.Final</version>
+        </dependency>
+        <!-- 实体映射转换 end -->
     </dependencies>
 
     <profiles>