From 3ad743f85d22406d38a26e13d4eb991509bfa4d0 Mon Sep 17 00:00:00 2001 From: yqy Date: Wed, 6 Jul 2022 15:56:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9(=E6=9C=AA?= =?UTF-8?q?=E6=B5=8B=E8=AF=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baiye/module/service/ClueRecordService.java | 9 +++++++++ .../module/service/impl/ClueRecordServiceImpl.java | 14 ++++++++++---- .../main/java/com/baiye/task/FileAnalysisTask.java | 7 ++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/service/ClueRecordService.java b/services/ad-platform-source/src/main/java/com/baiye/module/service/ClueRecordService.java index ff88cefa..17331d45 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/service/ClueRecordService.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/service/ClueRecordService.java @@ -1,7 +1,10 @@ package com.baiye.module.service; +import com.baiye.module.entity.ClueRecord; import com.baiye.module.service.dto.ClueRecordQueryCriteria; +import java.util.List; + public interface ClueRecordService { /** @@ -17,4 +20,10 @@ public interface ClueRecordService { * @return */ Object auditFile(ClueRecordQueryCriteria clueRecordQueryCriteria); + + /** + * 修改为上传失败状态 + * @param clueRecords + */ + void updateList(List clueRecords); } diff --git a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueRecordServiceImpl.java b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueRecordServiceImpl.java index c0f712df..80088a65 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueRecordServiceImpl.java +++ b/services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueRecordServiceImpl.java @@ -2,21 +2,18 @@ package com.baiye.module.service.impl; import cn.hutool.core.collection.CollUtil; import com.baiye.constant.DefaultNumberConstants; -import com.baiye.exception.BadRequestException; import com.baiye.feign.UserClient; import com.baiye.http.CommonResponse; import com.baiye.module.dao.ClueRecordRepository; import com.baiye.module.entity.ClueRecord; import com.baiye.module.service.ClueRecordService; -import com.baiye.module.service.dto.ClueRecordDto; import com.baiye.module.service.dto.ClueRecordQueryCriteria; -import com.baiye.module.service.mapstruct.ClueRecordMapper; import com.baiye.task.FileAnalysisTask; -import com.baiye.util.QueryHelp; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -102,4 +99,13 @@ public class ClueRecordServiceImpl implements ClueRecordService { } return null; } + + @Override + @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class) + public void updateList(List clueRecords) { + //导入文件记录失败修改状态 + clueRecords.forEach(cs -> cs.setStatus(false)); + log.info("===================0.0执行更新0.0========================={}",clueRecords); + clueRecordRepository.saveAll(clueRecords); + } } diff --git a/services/ad-platform-source/src/main/java/com/baiye/task/FileAnalysisTask.java b/services/ad-platform-source/src/main/java/com/baiye/task/FileAnalysisTask.java index 5e896d6c..33195287 100644 --- a/services/ad-platform-source/src/main/java/com/baiye/task/FileAnalysisTask.java +++ b/services/ad-platform-source/src/main/java/com/baiye/task/FileAnalysisTask.java @@ -22,6 +22,7 @@ import com.baiye.module.listener.KsExcelListener; import com.baiye.module.listener.TaskZdyExcelListener; import com.baiye.module.listener.UcCsvListener; import com.baiye.module.listener.ZdyExcelListener; +import com.baiye.module.service.ClueRecordService; import com.baiye.module.service.ClueService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -43,6 +44,8 @@ public class FileAnalysisTask { @Resource private ClueService clueService; @Resource + private ClueRecordService clueRecordService; + @Resource private ClueJpa clueJpa; @Resource private ClueRepository clueRepository; @@ -96,9 +99,7 @@ public class FileAnalysisTask { } } catch (Exception e) { taskClient.sendErrMessage("导入资源错误,请检查数据格式后重新导入", clueRecords.get(0).getCreateBy()); - //导入文件记录失败修改状态 - clueRecords.forEach(cs -> cs.setStatus(false)); - clueRecordRepository.saveAll(clueRecords); + clueRecordService.updateList(clueRecords); e.printStackTrace(); throw new BadRequestException("=========读取资源错误============"); }