修改bug

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<Task> queryDetails(@RequestParam("taskId") Long taskId) {

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:

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<Task> queryDetails(@RequestParam("taskId") Long taskId, @RequestHeader(SecurityConstants.FROM) String from);
-    ResponseEntity<Task> queryDetails(@RequestParam("taskId") Long taskId);
 
     @ApiOperation("修改任务信息")
     @PostMapping(PAY_PREFIX + "/update")

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<Task> queryDetails(Long taskId) {
+    public ResponseEntity<Task> queryDetails(Long taskId, String from) {
         return null;
     }
 
+
     @Override
     public CommonResponse<Object> updateTask(Task task) {
         return null;

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<Task> response = taskClient.queryDetails(taskId);
+        ResponseEntity<Task> 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<Task> response = taskClient.queryDetails(taskId);
+            ResponseEntity<Task> response = taskClient.queryDetails(taskId, SecurityConstants.FROM_IN);
             if (response.getStatusCode().value() != 200) {
                 throw new BadRequestException("查询错误");
             }
@@ -1205,4 +1204,5 @@ public class ClueServiceImpl implements ClueService {
 
 
 
+
 }

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<String> tagList, List<String> decryptList) {
         // 请求黑名单
+        Task task = findByTaskId(taskId);
         List<String> isNotblackList = IsBlackUtil.getNotblackList(decryptList);
         List<String> 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;
+    }
+
 }

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();
         }

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();
         }