同步删除tag逻辑

ad-platform-common/ad-platform-common-core/pom.xml

@@ -128,6 +128,8 @@
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
         </dependency>
+
+
     </dependencies>
 
 

ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/TagTypeConstant.java

@@ -0,0 +1,22 @@
+package com.baiye.constant;
+
+/**
+ * 0:巨量 1:百度 2:快手 3:UC 4:VIVO 5:广点通
+ */
+public class TagTypeConstant {
+    private TagTypeConstant(){
+
+    }
+
+    public static final int JL = 0;
+
+    public static final int BD = 1;
+
+    public static final int KS = 2;
+
+    public static final int UC = 3;
+
+    public static final int VIVO = 4;
+
+    public static final int GDT = 5;
+}

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/httpRequest/AdBackRequestApi.java

@@ -21,11 +21,15 @@ public class AdBackRequestApi {
     @Value("${ad-back.url}")
     private String url;
 
+
+    @Value("${ad-back.delUrl}")
+    private String delUrl;
+
     @Value("${ad-back.token}")
     private String token;
 
     public void sendTag(Long taskId, Long userId, List<String> tagStr) {
-        Map<String, Object> map = new HashMap<>(2);
+        Map<String, Object> map = new HashMap<>(4);
         map.put("taskId", taskId);
         map.put("userId", userId);
         map.put("token", token);
@@ -33,6 +37,15 @@ public class AdBackRequestApi {
         String post = HttpUtil.post(url, JSONUtil.toJsonStr(map));
         log.info("推送结果={}", post);
     }
+
+
+    public void delTag(Long taskId) {
+        Map<String, Object> map = new HashMap<>(4);
+        map.put("taskId", taskId);
+        map.put("token", token);
+        HttpUtil.post(delUrl, JSONUtil.toJsonStr(map));
+    }
+
 }
 
 

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

@@ -2,6 +2,7 @@ package com.baiye.modules.platform.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
@@ -377,7 +378,9 @@ public class TaskServiceImpl implements TaskService {
     @Transactional(rollbackOn = Exception.class)
     public void updateTask(Task task) {
         if (task.getId() != null) {
+            log.info("==================== task id {} date time {} ====================", task.getId(), DateUtil.date());
             Task updateTask = taskRepository.findById(task.getId()).orElseGet(Task::new);
+            if (ObjectUtil.isNotNull(updateTask) && updateTask.getId() != null) {
                 if (task.getRemark() != null) {
                     updateTask.setRemark(task.getRemark());
                 }
@@ -391,6 +394,7 @@ public class TaskServiceImpl implements TaskService {
                     updateTask.setLabelOrganizeId(task.getLabelOrganizeId());
                 }
                 taskRepository.save(updateTask);
+            }
         } else {
             throw new BadRequestException("任务id不能为空");
         }
@@ -405,6 +409,11 @@ public class TaskServiceImpl implements TaskService {
         taskOrganizeRepository.deleteByTaskId(taskId);
         //3、删除任务分配比率关系
         taskUserDistributionRepository.deleteByTaskId(taskId);
+
+        Task task = taskRepository.findById(taskId).orElseGet(Task::new);
+        if (ObjectUtil.isNotNull(task)) {
+            adBackRequestApi.delTag(taskId);
+        }
         //4、删除资源
         ResponseEntity<Object> response = sourceClueClient.delClueAll(new HashSet<>(Collections.singleton(taskId)));
         if (response.getStatusCode().value() != 200) throw new BadRequestException("操作失败");
@@ -440,7 +449,7 @@ public class TaskServiceImpl implements TaskService {
         taskRepository.save(task);
         String key = "task:encryption:" + taskId;
         if (!redisUtils.hasKey(key)) {
-            redisUtils.set(key, task.getIsEncryption() + "", 2592000);
+            redisUtils.set(key, String.valueOf(task.getIsEncryption()), 2592000);
         }
     }
 

ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml

@@ -197,7 +197,8 @@ ocean:
     welcomeUrl: https://baiyee.vip/
 
 ad-back:
-  url: cb.tuoz.net/api/ad-platform/tag
+  url: 127.0.0.1:9191/api/ad-platform/tag
+  delUrl: 127.0.0.1:9191/api/ad-platform/deleteTag
   token: 4f41de7d-97a3-4a40-b682-b9fc73b92459
 
 activation:

ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml

@@ -197,6 +197,7 @@ ocean:
 
 ad-back:
   url: cb.tuoz.net/api/ad-platform/tag
+  delUrl: cb.tuoz.net/api/ad-platform/deleteTag
   token: 4f41de7d-97a3-4a40-b682-b9fc73b92459
 
 activation: