From 8001cbb26ba4041c57397a7252d20a4351e10ba6 Mon Sep 17 00:00:00 2001 From: bynt Date: Wed, 24 May 2023 09:46:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E9=80=81=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/baiye/constant/LogType.java | 3 ++- .../platform/service/impl/DownRecordServiceImpl.java | 5 ++--- .../java/com/baiye/timed/DeliveryBalanceTask.java | 2 ++ .../src/main/java/com/baiye/util/FileAndMailUtil.java | 11 +++++++++++ .../src/main/java/com/baiye/task/MailSourceTask.java | 10 ++++++---- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ad-platform-common/ad-platform-common-log/src/main/java/com/baiye/constant/LogType.java b/ad-platform-common/ad-platform-common-log/src/main/java/com/baiye/constant/LogType.java index dd8d7e1f..f328f390 100644 --- a/ad-platform-common/ad-platform-common-log/src/main/java/com/baiye/constant/LogType.java +++ b/ad-platform-common/ad-platform-common-log/src/main/java/com/baiye/constant/LogType.java @@ -1,7 +1,8 @@ package com.baiye.constant; /** - * 有关加解密的常量类 + * @author Yqy + * @date 2023-5-23 */ public class LogType { diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java index 6ff990be..9f16201f 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DownRecordServiceImpl.java @@ -74,7 +74,6 @@ public class DownRecordServiceImpl implements DownRecordService { downRecord.setCompanyName(componentName); downRecord.setId(IdUtil.getSnowflake().nextId()); downRecord.setStatus(DefaultNumberConstants.ZERO_NUMBER); - return downRecordRepository.save(downRecord).getId(); } @@ -123,8 +122,8 @@ public class DownRecordServiceImpl implements DownRecordService { String uuid = IdUtil.fastSimpleUUID(); String file = deliveryProperties.getFileUrl().concat(StrPool.SLASH).concat(uuid); String filePath = deliveryProperties.getDmpDownPath().concat(uuid).concat(FileConstant.ZIP_FILE_SUB_NAME); - // 只保存文件地址 - String zipPath = FileAndMailUtil.zipFileAndSendDMPMail(dtoArrayList, file, null, deliveryProperties, DefaultNumberConstants.THREE_NUMBER); + // 只保存文件地址不发送邮件 + String zipPath = FileAndMailUtil.zipFile(dtoArrayList, file, deliveryProperties); Long downId = this.createRecord(dtoArrayList.size(), "超级管理员", taskName, zipPath, filePath, DefaultNumberConstants.TWO_NUMBER); for (List list : partition) { String taskImeiName = redisUtils.acquisitionBatch(MailRequestEnum.MM.getCacheName()); diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java index e0b82c63..403d5db6 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java @@ -7,6 +7,7 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import com.baiye.common.CommonLog; import com.baiye.config.properties.DeliveryProperties; import com.baiye.constant.DefaultNumberConstants; import com.baiye.constant.FileConstant; @@ -186,6 +187,7 @@ public class DeliveryBalanceTask { return; } String file = fileUrl.concat(StrPool.SLASH).concat(taskImeiName); + CommonLog.info("发送邮件,当前tag值为".concat(toList.get(DefaultNumberConstants.ZERO_NUMBER).getTag())); String zipPath = FileAndMailUtil.zipFileAndSendDMPMail(toList, file, taskImeiName, deliveryProperties, DefaultNumberConstants.ONE_NUMBER); // 保存发送记录 deliveryRecordService.saveDeliveryRecord(zipPath, taskImeiName, diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/FileAndMailUtil.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/FileAndMailUtil.java index 12d645f4..7a8996d1 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/FileAndMailUtil.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/util/FileAndMailUtil.java @@ -46,4 +46,15 @@ public class FileAndMailUtil { return zipPath; } + public static String zipFile(List list, String file, DeliveryProperties deliveryProperties) { + String csvPath = file.concat(StrPool.DOT).concat(FileConstant.CSV_FILE_SUB_NAME); + CSVFileUtil.createCsvFile(list, csvPath); + String zipPath = file.concat(FileConstant.ZIP_FILE_SUB_NAME); + // 设置压缩文件 + CompressUtil.decryptionCompression + (zipPath, csvPath, deliveryProperties.getZipPassword()); + return zipPath; + } + + } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java index 5608b39c..71db4ed3 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java @@ -8,6 +8,7 @@ import cn.hutool.core.text.StrPool; import cn.hutool.core.text.csv.*; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; +import com.baiye.common.CommonLog; import com.baiye.config.properties.DeliveryProperties; import com.baiye.constant.AdPlatFormConstants; import com.baiye.constant.DefaultNumberConstants; @@ -126,14 +127,15 @@ public class MailSourceTask { if (CollUtil.isNotEmpty(decryptList)) { log.info("=================== the decryptList size as {} =====================", decryptList.size()); if (byTaskName.getType() == DefaultNumberConstants.ONE_NUMBER) { + CommonLog.info("接收邮件,当前tag值为".concat(tagList.get(DefaultNumberConstants.ZERO_NUMBER))); saveClue(taskName, byTaskName, task, taskId, tagList, decryptList, path, unzipPath); } - if (byTaskName.getType() == DefaultNumberConstants.THREE_NUMBER) { - sendRequest(taskName, tagList, decryptList, path, unzipPath); - } if (byTaskName.getType() == DefaultNumberConstants.TWO_NUMBER) { downResource(taskName, byTaskName, decryptList, path, data.getRows(), parseFile); } + if (byTaskName.getType() == DefaultNumberConstants.THREE_NUMBER) { + sendRequest(taskName, tagList, decryptList, path, unzipPath); + } } } } @@ -172,7 +174,7 @@ public class MailSourceTask { Integer saveNumer = clueService.saveClue (tagList, isNotblackList, byTaskName.getTaskId(), - byTaskName.getUserId(), DefaultNumberConstants.FOUR_NUMBER); + byTaskName.getUserId(), DefaultNumberConstants.FOUR_NUMBER); // 修改任务总条数 Integer taskNum = clueTalkRepository.findTaskNum(taskId); task.setId(taskId);