From 67d821789a0ac31e15f7b1e17377707fe3fc03a0 Mon Sep 17 00:00:00 2001 From: bynt Date: Tue, 18 Apr 2023 16:26:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=A0=E9=99=A4tag?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ad-platform-common-core/pom.xml | 2 + .../com/baiye/constant/TagTypeConstant.java | 22 +++++++++++ .../httpRequest/AdBackRequestApi.java | 15 ++++++- .../service/impl/TaskServiceImpl.java | 39 ++++++++++++------- .../main/resources/config/application-dev.yml | 3 +- .../resources/config/application-prod.yml | 1 + 6 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/TagTypeConstant.java diff --git a/ad-platform-common/ad-platform-common-core/pom.xml b/ad-platform-common/ad-platform-common-core/pom.xml index 9dc0ad15..e0b97c29 100644 --- a/ad-platform-common/ad-platform-common-core/pom.xml +++ b/ad-platform-common/ad-platform-common-core/pom.xml @@ -128,6 +128,8 @@ net.lingala.zip4j zip4j + + diff --git a/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/TagTypeConstant.java b/ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/TagTypeConstant.java new file mode 100644 index 00000000..14be97be --- /dev/null +++ b/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; +} diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/httpRequest/AdBackRequestApi.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/httpRequest/AdBackRequestApi.java index a9b297d2..1df32610 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/httpRequest/AdBackRequestApi.java +++ b/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 tagStr) { - Map map = new HashMap<>(2); + Map 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 map = new HashMap<>(4); + map.put("taskId", taskId); + map.put("token", token); + HttpUtil.post(delUrl, JSONUtil.toJsonStr(map)); + } + } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java index f870af94..930e65d9 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskServiceImpl.java +++ b/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,20 +378,23 @@ 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 (task.getRemark() != null) { - updateTask.setRemark(task.getRemark()); - } - if (task.getTotalNumber() != null) { - updateTask.setTotalNumber(task.getTotalNumber()); - } - if (task.getIsDistribution() != null) { - updateTask.setIsDistribution(task.getIsDistribution()); - } - if (task.getLabelOrganizeId() != null) { - updateTask.setLabelOrganizeId(task.getLabelOrganizeId()); + if (ObjectUtil.isNotNull(updateTask) && updateTask.getId() != null) { + if (task.getRemark() != null) { + updateTask.setRemark(task.getRemark()); + } + if (task.getTotalNumber() != null) { + updateTask.setTotalNumber(task.getTotalNumber()); + } + if (task.getIsDistribution() != null) { + updateTask.setIsDistribution(task.getIsDistribution()); + } + if (task.getLabelOrganizeId() != null) { + updateTask.setLabelOrganizeId(task.getLabelOrganizeId()); + } + taskRepository.save(updateTask); } - 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 response = sourceClueClient.delClueAll(new HashSet<>(Collections.singleton(taskId))); if (response.getStatusCode().value() != 200) throw new BadRequestException("操作失败"); @@ -418,7 +427,7 @@ public class TaskServiceImpl implements TaskService { map.put("type", type); map.put("code", 500); String messageJSON; - if (type.equals("create")){ + if (type.equals("create")) { map.put("code", 200); messageJSON = JSONUtil.toJsonStr(map); } else { @@ -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); } } @@ -457,7 +466,7 @@ public class TaskServiceImpl implements TaskService { Map> map = organizeList.stream().collect(Collectors.groupingBy(Organize::getId)); if (CollUtil.isNotEmpty(taskOrganizeList)) { for (TaskOrganize taskOrganize : taskOrganizeList) { - if (map.containsKey(taskOrganize.getOrganizeId())){ + if (map.containsKey(taskOrganize.getOrganizeId())) { List organizes = map.get(taskOrganize.getOrganizeId()); taskOrganize.setOrganizeName(organizes.get(0).getOrganizeName()); } diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml index b08a18d0..78e839da 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-dev.yml +++ b/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: diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml index 8c005921..3f667097 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application-prod.yml +++ b/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: