From 2af125cf10a5c339384625b97ff57acf84519b19 Mon Sep 17 00:00:00 2001
From: bynt <13586541001@163.com>
Date: Mon, 13 Nov 2023 14:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/service/impl/DeliveryRecordServiceImpl.java     | 2 ++
 .../baiye/module/service/impl/DmpCallbackServiceImpl.java  | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DeliveryRecordServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DeliveryRecordServiceImpl.java
index e0dcf964..7ac474c7 100644
--- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DeliveryRecordServiceImpl.java
+++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DeliveryRecordServiceImpl.java
@@ -8,6 +8,7 @@ import com.baiye.module.service.DeliveryRecordService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -31,6 +32,7 @@ public class DeliveryRecordServiceImpl implements DeliveryRecordService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateStatusByTaskName(Integer num, Integer decryptSize, String taskName) {
         return deliveryRecordRepository.updateStatusAndDecryptNum
                 (num, decryptSize, taskName) > DefaultNumberConstants.ZERO_NUMBER;
diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java
index 056a13ec..75a09308 100644
--- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java
+++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java
@@ -122,11 +122,9 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
                             // 异步方式下载
                             List<String> finalResponseList = responseList;
                             CompletableFuture.runAsync(() -> downResource(bathNo, byTaskName, originalList, finalResponseList));
-                            deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, finalResponseList.size(), bathNo);
                         }
                         if (byTaskName.getType() == DefaultNumberConstants.FOUR_NUMBER) {
                             CompletableFuture.runAsync(() -> downReceptionResource(bathNo, byTaskName, originalList));
-                            deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo);
                         }
                     }
                     // 兑换结果失败也将结果返回
@@ -199,6 +197,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
             FileZipUtil.writeToCsv(csvList, parseFile.getPath(), Boolean.TRUE);
             // 设置压缩文件
             CompressUtil.decryptionCompression(path, parseFile.getPath(), null);
+            deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, responseList.size(), taskName);
             FileUtil.del(unzipPath);
             return;
         }
@@ -219,6 +218,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
         FileUtil.del(csvPath);
         String downUrl = deliveryProperties.getDmpDownPath().concat(filePath);
         deliveryRecordClient.updatePath(zipPath, downUrl, byTaskName.getDownId(), SecurityConstants.FROM_IN);
+        deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, responseList.size(), taskName);
         redisUtils.set(CacheKey.DMP_DOWN_URL.concat(String.valueOf(byTaskName.getDownId())), zipPath, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
     }
 
@@ -250,8 +250,8 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
                     Integer.parseInt(downNum.toString()) + strings.size() : strings.size();
             // 设置压缩文件
             CompressUtil.decryptionCompression(path, parseFile.getPath(), null);
-
             deliveryRecordClient.updateOriginAndSize(byTaskName.getUserId(), format, size, SecurityConstants.FROM_IN);
+            deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, originalList.size(), bathNo);
             redisUtils.set(CacheKey.DMP_TRIPARTITE_NUM.concat(format), size, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
             FileUtil.del(unzipPath);
             return;
@@ -272,6 +272,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
                 (zipPath.lastIndexOf(StrPool.SLASH) + DefaultNumberConstants.ONE_NUMBER);
         FileUtil.del(csvPath);
         String downUrl = deliveryProperties.getDmpDownPath().concat(filePath);
+        deliveryRecordService.updateStatusByTaskName(DefaultNumberConstants.ONE_NUMBER, stringSet.size(), bathNo);
         deliveryRecordClient.savePathAndSetDateStr(byTaskName.getUserId(), stringSet.size(), zipPath, downUrl, format, SecurityConstants.FROM_IN);
         redisUtils.set(CacheKey.DMP_TRIPARTITE_URL.concat(format), zipPath, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
         redisUtils.set(CacheKey.DMP_TRIPARTITE_NUM.concat(format), originalList.size(), DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);