添加兑换方式

ad-platform-gateway/src/main/resources/config/application.yml

@@ -1,5 +1,9 @@
 
 spring:
+  servlet:
+    session:
+      # 配置会话超时
+      timeout: 20s
   profiles:
     active: dev
   cloud:

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;
 
 
 }

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<DeliveryRecord> findByDownId(Long downId);
+
 }

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);
 }

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;
@@ -97,4 +98,13 @@ public class DeliveryRecordServiceImpl implements DeliveryRecordService {
         }
         return Boolean.FALSE;
     }
+
+    @Override
+    public DeliveryRecord queryByDownId(Long downId) {
+        List<DeliveryRecord> deliveryRecordList = deliveryRecordRepository.findByDownId(downId);
+        if (CollUtil.isNotEmpty(deliveryRecordList)) {
+            return deliveryRecordList.get(DefaultNumberConstants.ZERO_NUMBER);
+        }
+        return new DeliveryRecord();
+    }
 }

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<String, Object> queryAll(DownRecordQueryCriteria criteria, Pageable pageable) {
         Page<DownRecord> 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;

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 #连续上传文件大小