diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/rest/TaskController.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/rest/TaskController.java index 81192b1c..0d6bd708 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/rest/TaskController.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/rest/TaskController.java @@ -68,6 +68,7 @@ public class TaskController { return new ResponseEntity<>(taskService.list(taskQueryCriteria), HttpStatus.OK); } + @Inner @ApiOperation("查询任务详情") @GetMapping("/queryDetails") public ResponseEntity queryDetails(@RequestParam("taskId") Long taskId) { diff --git a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml index b3c6fdb3..638c1612 100644 --- a/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml +++ b/ad-platform-manage/ad-platform-management/src/main/resources/config/application.yml @@ -9,7 +9,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/TaskClient.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/TaskClient.java index 72171504..727a6479 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/TaskClient.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/TaskClient.java @@ -40,8 +40,7 @@ public interface TaskClient { @ApiOperation("查询任务详情") @GetMapping(PAY_PREFIX + "/queryDetails") - @Cacheable(value = "taskName", key = "'task:name:' + #p0") - ResponseEntity queryDetails(@RequestParam("taskId") Long taskId); + ResponseEntity queryDetails(@RequestParam("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM) String from); @ApiOperation("修改任务信息") @PostMapping(PAY_PREFIX + "/update") diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/fallback/TaskClientFallback.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/fallback/TaskClientFallback.java index 4545176b..1f2a229d 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/fallback/TaskClientFallback.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/feign/fallback/TaskClientFallback.java @@ -38,10 +38,11 @@ public class TaskClientFallback implements TaskClient { } @Override - public ResponseEntity queryDetails(Long taskId) { + public ResponseEntity queryDetails(Long taskId, String from) { return null; } + @Override public CommonResponse updateTask(Task task) { return null; diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java index 407f79bc..e24263dc 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import com.baiye.common.CommonLog; import com.baiye.constant.*; import com.baiye.enums.ClueStageEnum; @@ -757,7 +756,7 @@ public class ClueServiceImpl implements ClueService { } //查询任务信息 - ResponseEntity response = taskClient.queryDetails(taskId); + ResponseEntity response = taskClient.queryDetails(taskId, SecurityConstants.FROM_IN); if (response.getStatusCode().value() != 200 || response.getBody() == null) { throw new BadRequestException("查询错误"); } @@ -1049,7 +1048,7 @@ public class ClueServiceImpl implements ClueService { String taskNameKey = KeyFieldConstants.TASK_NAME_KEY + taskId; String str = (String) redisUtils.get(taskNameKey); if (StringUtils.isEmpty(str) || "null".equals(str)) { - ResponseEntity response = taskClient.queryDetails(taskId); + ResponseEntity response = taskClient.queryDetails(taskId, SecurityConstants.FROM_IN); if (response.getStatusCode().value() != 200) { throw new BadRequestException("查询错误"); } @@ -1205,4 +1204,5 @@ public class ClueServiceImpl implements ClueService { + } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java index bea6a658..ac7ec4e6 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/DmpCallbackServiceImpl.java @@ -149,10 +149,9 @@ public class DmpCallbackServiceImpl implements DmpCallbackService { private void saveClue(String taskName, DeliveryRecord byTaskName, Long taskId, List tagList, List decryptList) { // 请求黑名单 + Task task = findByTaskId(taskId); List isNotblackList = IsBlackUtil.getNotblackList(decryptList); List onLineNotblackList = IsBlackUtil.getOnLineNotblackList(isNotblackList); - Task task = taskClient.queryDetails(taskId).getBody(); - if (ObjectUtil.isNotNull(task) && ObjectUtil.isNotNull(task.getIsForm()) && task.getIsForm() == DefaultNumberConstants.EIGHT_NUMBER) { @@ -325,4 +324,13 @@ public class DmpCallbackServiceImpl implements DmpCallbackService { } } } + + public Task findByTaskId(Long taskId) { + Task body = taskClient.queryDetails(taskId, SecurityConstants.FROM_IN).getBody(); + if (body != null) { + return body; + } + return null; + } + } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportCrmServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportCrmServiceImpl.java index 320bd8dc..b990ca0f 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportCrmServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportCrmServiceImpl.java @@ -441,9 +441,9 @@ public class ReportCrmServiceImpl implements ReportCrmService { return taskSet; } - + @Cacheable(value = "taskName", key = "'task:name:' + #p0") public String findByTaskId(Long taskId) { - Task body = taskClient.queryDetails(taskId).getBody(); + Task body = taskClient.queryDetails(taskId, SecurityConstants.FROM_IN).getBody(); if (body != null) { return body.getTaskName(); } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java index 6b25b63f..ea42725d 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ReportTokerServiceImpl.java @@ -12,6 +12,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baiye.constant.ClueTypeConstants; import com.baiye.constant.DefaultNumberConstants; +import com.baiye.constant.SecurityConstants; import com.baiye.constant.SourceLabelConstants; import com.baiye.exception.BadRequestException; import com.baiye.feign.OrganizeClient; @@ -348,7 +349,7 @@ public class ReportTokerServiceImpl implements ReportTokerService { @Cacheable(value = "taskName", key = "'task:name:' + #p0") public String findByTaskId(Long taskId) { - Task body = taskClient.queryDetails(taskId).getBody(); + Task body = taskClient.queryDetails(taskId, SecurityConstants.FROM_IN).getBody(); if (body != null) { return body.getTaskName(); }