添加是否投放线索

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/dto/TaskTagDto.java

@@ -1,5 +1,6 @@
 package com.baiye.modules.platform.service.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -37,4 +38,9 @@ public class TaskTagDto {
     private Long labelOrganizeId;
 
     private String remark;
+
+
+    @ApiModelProperty(value = "是否dmp投放")
+    private Boolean isDmpDelivery;
+
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java

@@ -31,7 +31,6 @@ import com.baiye.util.RedisUtils;
 import com.baiye.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -91,7 +90,7 @@ public class TaskServiceImpl implements TaskService {
             return CommonResponse.createBySuccess(tag);
         }
         createTask(taskId, taskTagDto.getUserId(), taskTagDto.getTaskName(), DefaultNumberConstants.FOUR_NUMBER, taskTagDto.getLabelOrganizeId(), taskTagDto
-                .getRemark());
+                .getRemark(),taskTagDto.getIsDmpDelivery());
         // 推送到adbask
         List<String> collect = taskTagDto.getTagStr().stream().map(String::trim).collect(Collectors.toList());
         adBackRequestApi.sendTag(taskId, taskTagDto.getUserId(), collect);
@@ -120,6 +119,12 @@ public class TaskServiceImpl implements TaskService {
         if (CollUtil.isNotEmpty(tag)) {
             return CommonResponse.createBySuccess(tag);
         }
+        Task task = taskRepository.findById(taskTagDto.getTaskId()).orElseGet(Task::new);
+        if (task.getIsDmpDelivery() != null
+                && !task.getIsDmpDelivery().equals(taskTagDto.getIsDmpDelivery())){
+            task.setIsDmpDelivery(taskTagDto.getIsDmpDelivery());
+            taskRepository.save(task);
+        }
         List<String> collect = taskTagDto.getTagStr().stream().map(String::trim).collect(Collectors.toList());
         adBackRequestApi.sendTag(taskTagDto.getTaskId(), taskTagDto.getUserId(), collect);
         return CommonResponse.createBySuccess();
@@ -158,7 +163,7 @@ public class TaskServiceImpl implements TaskService {
     }
 
 
-    private void createTask(Long taskId, Long id, String taskName, Integer isForm, Long labelOrganizeId, String remark) {
+    private void createTask(Long taskId, Long id, String taskName, Integer isForm, Long labelOrganizeId, String remark, Boolean isDmpDelivery) {
         Task task = new Task();
         task.setId(taskId);
         task.setEncryptionType(DefaultNumberConstants.ZERO_NUMBER);
@@ -169,6 +174,7 @@ public class TaskServiceImpl implements TaskService {
         task.setCreateBy(id);
         task.setRemark(remark);
         task.setTaskName(taskName);
+        task.setIsDmpDelivery(isDmpDelivery);
         taskRepository.save(task);
     }
 

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java

@@ -90,10 +90,12 @@ public class DeliveryBalanceTask {
                 log.info("=================== the task Id as {},upload size as {} ====================", taskId, list.size());
                 Long userId = list.get(DefaultNumberConstants.ZERO_NUMBER).getUserId();
                 ChannelCustom channelCustom = customManageService.findCustomByUserIdAndStatus(userId, DefaultNumberConstants.ONE_NUMBER);
+                TaskTagDto taskTagDto = taskService.queryDmpTask(taskId);
                 UserDto userInfo = userService.findUserInfo(userId);
-                if (ObjectUtil.isNotNull(userInfo)
+                if (ObjectUtil.isNotNull(userInfo) && ObjectUtil.isNotNull(taskTagDto)
                         && Boolean.TRUE.equals(userInfo.getEnabled())
-                                && ObjectUtil.isNotNull(channelCustom)) {
+                                && ObjectUtil.isNotNull(channelCustom)
+                                        && Boolean.TRUE.equals(taskTagDto.getIsDmpDelivery())) {
                     Integer dmpLimitNum = channelCustom.getDmpLimitNum();
                     // 找出两天之内未兑换的数量
                     Integer number = deliveryRecordService.queryNumberByDateAndUser
@@ -147,7 +149,7 @@ public class DeliveryBalanceTask {
                             }
                         }
                         // 处理下载包
-                        if (CollUtil.isNotEmpty(downList) && downList.size() > DefaultNumberConstants.TWO_HUNDRED) {
+                        if (CollUtil.isNotEmpty(downList) && downList.size() > DefaultNumberConstants.FIVE_HUNDRED) {
                             zipDownList(taskId, downList, userInfo);
                         }
                     } finally {

ad-platform-pojo/src/main/java/com/baiye/model/entity/BaseTask.java

@@ -91,4 +91,11 @@ public class BaseTask implements Serializable {
     @ApiModelProperty(value = "是否开启了自动分配 0:关闭  1:开启")
     @Column(name = "is_open")
     private Integer isOpen = 0;
+
+
+    @ApiModelProperty(value = "dmp是否投放")
+    @Column(name = "is_dmp_delivery")
+    private Boolean isDmpDelivery = Boolean.TRUE;
+
+
 }