From 8f580ac64dcd0d0b65aa628e02ac7edf00d61950 Mon Sep 17 00:00:00 2001 From: bynt <13586541001@163.com> Date: Mon, 4 Dec 2023 13:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=91=E6=8D=A2=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application.yml | 4 ++++ .../baiye/modules/platform/domain/DownRecord.java | 10 +++++++++- .../repository/DeliveryRecordRepository.java | 9 +++++++++ .../platform/service/DeliveryRecordService.java | 7 +++++++ .../service/impl/DeliveryRecordServiceImpl.java | 12 +++++++++++- .../service/impl/DownRecordServiceImpl.java | 14 +++++++++++++- .../src/main/resources/application.yml | 3 +++ 7 files changed, 56 insertions(+), 3 deletions(-) diff --git a/ad-platform-gateway/src/main/resources/config/application.yml b/ad-platform-gateway/src/main/resources/config/application.yml index 9f098d5d..d23c6840 100644 --- a/ad-platform-gateway/src/main/resources/config/application.yml +++ b/ad-platform-gateway/src/main/resources/config/application.yml @@ -1,5 +1,9 @@ spring: + servlet: + session: + # 配置会话超时 + timeout: 20s profiles: active: dev cloud: diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/domain/DownRecord.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/domain/DownRecord.java index f621b512..a02bb560 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/domain/DownRecord.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/domain/DownRecord.java @@ -65,7 +65,7 @@ public class DownRecord extends BaseEntity implements Serializable { private Integer type; @Column(name = "user_id") - @ApiModelProperty(value = "1 自动任务 2 是 手动发送") + @ApiModelProperty(value = "用户id") private Long userId; @@ -73,6 +73,14 @@ public class DownRecord extends BaseEntity implements Serializable { @ApiModelProperty(value = "解析文件地址") private String resolveFilePath; + @Transient + @ApiModelProperty("任务名称") + private String deliveryTaskName; + + + @Transient + @Column(name = "exchange_type") + private Integer exchangeType; } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/DeliveryRecordRepository.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/DeliveryRecordRepository.java index 7b977ef1..95420333 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/DeliveryRecordRepository.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/DeliveryRecordRepository.java @@ -59,4 +59,13 @@ public interface DeliveryRecordRepository extends @Query("select sum(d.num) from DeliveryRecord d where d.userId = ?3 and d.createTime between ?1 and ?2 ") Integer queryNumberByDateAndUser(DateTime dateTime, DateTime time, Long userId); + + /** + * 根据任务名称查询 + * + * @param downId + * @return + */ + List findByDownId(Long downId); + } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/DeliveryRecordService.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/DeliveryRecordService.java index f4548209..6270dc51 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/DeliveryRecordService.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/DeliveryRecordService.java @@ -72,4 +72,11 @@ public interface DeliveryRecordService { * @return */ Boolean setCallBackUrl(String url); + + /** + * 下载方式查找记录 + * @param downId + * @return + */ + DeliveryRecord queryByDownId(Long downId); } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DeliveryRecordServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DeliveryRecordServiceImpl.java index 79f60899..0adfba08 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DeliveryRecordServiceImpl.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/DeliveryRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.baiye.modules.platform.service.impl; import cn.hutool.core.codec.Base64; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateTime; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.RandomUtil; @@ -74,7 +75,7 @@ public class DeliveryRecordServiceImpl implements DeliveryRecordService { }); ExchangeStripsDTO build = ExchangeStripsDTO.builder().batchId(taskImeiName).reqId (RandomUtil.randomString(DefaultNumberConstants.TEN_NUMBER)).orgCode - (exchangeProperties.getOrgCode()).datas(list).type(uploadType).build(); + (exchangeProperties.getOrgCode()).datas(list).type(uploadType).build(); String post = HttpUtil.post(exchangeProperties.getSubmitUrl(), JSONUtil.toJsonStr(build)); log.info("============ the submit result as {} =========", JSONUtil.toJsonStr(post)); return Boolean.TRUE; @@ -97,4 +98,13 @@ public class DeliveryRecordServiceImpl implements DeliveryRecordService { } return Boolean.FALSE; } + + @Override + public DeliveryRecord queryByDownId(Long downId) { + List deliveryRecordList = deliveryRecordRepository.findByDownId(downId); + if (CollUtil.isNotEmpty(deliveryRecordList)) { + return deliveryRecordList.get(DefaultNumberConstants.ZERO_NUMBER); + } + return new DeliveryRecord(); + } } 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 b6ce5e16..7ecf0d98 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 @@ -18,6 +18,7 @@ import com.baiye.enums.MailRequestEnum; import com.baiye.exception.BadRequestException; import com.baiye.model.dto.wechat.SendMailDTO; import com.baiye.model.enums.ResponseCode; +import com.baiye.modules.platform.domain.DeliveryRecord; import com.baiye.modules.platform.domain.DownRecord; import com.baiye.modules.platform.repository.DownRecordRepository; import com.baiye.modules.platform.service.DeliveryRecordService; @@ -60,6 +61,17 @@ public class DownRecordServiceImpl implements DownRecordService { public Map queryAll(DownRecordQueryCriteria criteria, Pageable pageable) { Page page = downRecordRepository.findAll((root, query, cb) -> QueryHelp.getPredicate(root, criteria, cb), pageable); + + page.get().forEach(downRecord -> { + if (ObjectUtil.isNotNull(downRecord.getType()) + && downRecord.getType() == DefaultNumberConstants.TWO_NUMBER) { + DeliveryRecord deliveryRecord = deliveryRecordService.queryByDownId(downRecord.getId()); + if (ObjectUtil.isNotNull(deliveryRecord) && ObjectUtil.isNotNull(deliveryRecord.getId())) { + downRecord.setDeliveryTaskName(deliveryRecord.getTaskName()); + downRecord.setExchangeType(deliveryRecord.getExchangeType()); + } + } + }); return PageUtil.toPage(page); } @@ -130,7 +142,7 @@ public class DownRecordServiceImpl implements DownRecordService { String filePath = deliveryProperties.getDmpDownPath().concat(uuid).concat(FileConstant.ZIP_FILE_SUB_NAME); Long downId = this.createRecord(currentUserId, list.size(), currentUserId == DefaultNumberConstants.ONE_NUMBER ? "超级管理员" : "渠道管理员", taskName, sendMailDTO.getZipPath(), filePath, DefaultNumberConstants.TWO_NUMBER); - deliveryRecordService.saveDeliveryRecord(sendMailDTO.getZipPath(), taskImeiName,list.get(DefaultNumberConstants.ZERO_NUMBER).getTag(), list.size(), null, + deliveryRecordService.saveDeliveryRecord(sendMailDTO.getZipPath(), taskImeiName, list.get(DefaultNumberConstants.ZERO_NUMBER).getTag(), list.size(), null, SecurityUtils.getCurrentUserId(), DefaultNumberConstants.TWO_NUMBER, uploadType, downId); } return Boolean.TRUE; diff --git a/ad-platform-services/ad-platform-source/src/main/resources/application.yml b/ad-platform-services/ad-platform-source/src/main/resources/application.yml index 145c87c0..caa5de96 100644 --- a/ad-platform-services/ad-platform-source/src/main/resources/application.yml +++ b/ad-platform-services/ad-platform-source/src/main/resources/application.yml @@ -2,6 +2,9 @@ server: port: 7325 spring: servlet: + session: + # 配置会话超时 + timeout: 20s multipart: max-file-size: 100MB #单个文件上传大小 max-request-size: 600MB #连续上传文件大小