修改参数

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

@@ -146,12 +146,14 @@ public class AliPayServiceImpl implements AliPayService {
     }
 
     private boolean savePayOrder(AliPayPcDTO aliPayPcDTO, String orderNo) {
+        Long companyId = SecurityUtils.getCompanyId();
+        CompanyDto companyById = companyService.findCompanyById(companyId);
         PayOrder order = new PayOrder();
-        order.setPurchaser(SecurityUtils.getCurrentUsername());
+        order.setCompanyId(companyId);
         order.setOrderNumber(orderNo);
         order.setAmount(aliPayPcDTO.getAmount());
+        order.setPurchaser(companyById.getCompanyName());
         order.setUserId(SecurityUtils.getCurrentUserId());
-        order.setCompanyId(SecurityUtils.getCompanyId());
         order.setPayType(DefaultNumberConstants.ONE_NUMBER);
         order.setStatus(DefaultNumberConstants.ZERO_NUMBER);
         return payOrderRepository.save(order).getId() != null;

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

@@ -124,8 +124,8 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     public CommonResponse<Object> updateDmpTask(TaskTagDto taskTagDto) {
-        if (ObjectUtil.isNull(taskTagDto) || taskTagDto.getTaskId() == null) {
-            return CommonResponse.createByErrorMessage("任务id不能为空");
+        if (ObjectUtil.isNull(taskTagDto) || taskTagDto.getTaskId() == null || CollUtil.isEmpty(taskTagDto.getTagStr())) {
+            return CommonResponse.createByErrorMessage("修改参数不能为空");
         }
         List<String> tag = createTag(taskTagDto.getTaskId(), taskTagDto.getUserId(), taskTagDto.getTagStr());
         if (CollUtil.isNotEmpty(tag)) {

services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java

@@ -23,8 +23,10 @@ import com.baiye.module.service.dto.SecretResponseBean;
 import com.baiye.util.CompressUtil;
 import com.baiye.util.DecryptPnoUtil;
 import com.baiye.util.MailUtil;
+import com.baiye.util.RedisUtils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -37,10 +39,8 @@ import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 import java.io.File;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Enzo
@@ -53,6 +53,8 @@ public class MailSourceTask {
 
     private final TaskClient taskClient;
 
+    private final RedisUtils redisUtils;
+
     private final ClueService clueService;
 
     private final DeliveryProperties deliveryProperties;
@@ -76,6 +78,12 @@ public class MailSourceTask {
                     if (deliveryProperties.getToEmailAddress().equalsIgnoreCase
                             (MailUtil.getFrom((MimeMessage) message))) {
                         String taskName = message.getSubject();
+                        String str = (String) redisUtils.get(taskName);
+                        if (StringUtils.isNotBlank(str)) {
+                            return;
+                        }
+                        // 设置一天缓存
+                        redisUtils.set(taskName, taskName, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
                         // 内容获取发送请求
                         DeliveryRecord byTaskName = deliveryRecordService.findByTaskName(taskName);
                         if (ObjectUtil.isNotNull(byTaskName)
@@ -104,10 +112,12 @@ public class MailSourceTask {
 
                             data.getRows().forEach(clue -> phoneList.add
                                     (clue.get(DefaultNumberConstants.THREE_NUMBER)));
+                            // 去除重复
+                            List<String> phoneSets = Lists.newArrayList(Sets.newHashSet(phoneList));
 
                             log.info("=============== the phone list as {} ==================", phoneList.size());
                             // 集合分割
-                            List<List<String>> partitions = ListUtil.partition(phoneList, 200);
+                            List<List<String>> partitions = ListUtil.partition(phoneSets, 200);
                             for (List<String> partition : partitions) {
                                 String join = Joiner.on(StrPool.COMMA).skipNulls().join(partition);
                                 // 批量解析号码