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 821a2de4..81192b1c 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 @@ -170,5 +170,10 @@ public class TaskController { public TaskUserDTO findTaskId(@RequestParam(value = "userId") Long userId, @RequestParam("number") Integer number) { return taskService.queryTaskByUserId(userId, number); } - + @Inner + @ApiOperation("用户id获取任务id") + @GetMapping("/findTaskIdByUserId") + public Long findTaskIdByUserId(@RequestParam(value = "userId") Long userId, @RequestParam("isForm") Integer isForm) { + return taskService.findTaskIdByUserId(userId, isForm); + } } diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskService.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskService.java index 0bce3d17..a66ceea2 100644 --- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskService.java +++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskService.java @@ -105,6 +105,7 @@ public interface TaskService { /** * 用户id查找任务id + * * @param userId * @param number * @return @@ -113,9 +114,18 @@ public interface TaskService { /** * 修改任务加密方式 + * * @param taskId * @param encryptionType * @return */ Boolean updateTaskEncryption(Long taskId, Integer encryptionType); + + /** + * 用户id查找任务id + * @param userId + * @param isForm + * @return + */ + Long findTaskIdByUserId(Long userId, Integer isForm); } 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 f1c25483..a195f3fb 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 @@ -90,7 +90,7 @@ public class TaskServiceImpl implements TaskService { return CommonResponse.createBySuccess(tag); } createTask(taskId, taskTagDto.getUserId(), taskTagDto.getTaskName(), DefaultNumberConstants.FOUR_NUMBER, taskTagDto.getLabelOrganizeId(), taskTagDto - .getRemark(),taskTagDto.getIsDmpDelivery()); + .getRemark(), taskTagDto.getIsDmpDelivery()); // 推送到adbask List collect = taskTagDto.getTagStr().stream().map(String::trim).collect(Collectors.toList()); adBackRequestApi.sendTag(taskId, taskTagDto.getUserId(), collect); @@ -121,7 +121,7 @@ public class TaskServiceImpl implements TaskService { } Task task = taskRepository.findById(taskTagDto.getTaskId()).orElseGet(Task::new); if (task.getIsDmpDelivery() != null - && !task.getIsDmpDelivery().equals(taskTagDto.getIsDmpDelivery())){ + && !task.getIsDmpDelivery().equals(taskTagDto.getIsDmpDelivery())) { task.setIsDmpDelivery(taskTagDto.getIsDmpDelivery()); taskRepository.save(task); } @@ -306,7 +306,7 @@ public class TaskServiceImpl implements TaskService { public Set queryTaskId(TaskQueryCriteria taskQueryCriteria) { Boolean isManager = SecurityUtils.getCurrentUser().getUser().getIsManager(); Long whichUserId = SecurityUtils.getCurrentUser().getUser().getWhichUserId(); - if (isManager != null && !isManager && whichUserId != null){ + if (isManager != null && !isManager && whichUserId != null) { taskQueryCriteria.setCreateBy(whichUserId); } List taskDtoList = taskMapper.toDto(taskRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, taskQueryCriteria, criteriaBuilder))); @@ -553,4 +553,13 @@ public class TaskServiceImpl implements TaskService { redisUtils.set(key, String.valueOf(task.getEncryptionType()), 2592000); return Boolean.TRUE; } + + @Override + public Long findTaskIdByUserId(Long userId, Integer isForm) { + List byCreateByAndIsForm = taskRepository.findByCreateByAndIsForm(userId, isForm); + if (CollUtil.isEmpty(byCreateByAndIsForm) || byCreateByAndIsForm.size() > 1) { + return null; + } + return byCreateByAndIsForm.get(0).getId(); + } } 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 c9fd954e..40b1b0bd 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 @@ -1,5 +1,6 @@ package com.baiye.feign; +import com.baiye.annotation.Inner; import com.baiye.constant.SecurityConstants; import com.baiye.feign.fallback.TaskClientFallback; import com.baiye.http.CommonResponse; @@ -78,4 +79,7 @@ public interface TaskClient { */ @GetMapping(PAY_PREFIX + "/findTaskByUserId") TaskUserDTO findByTaskByUserId(@RequestParam(value = "userId") Long userId, @RequestParam("number") Integer number, @RequestHeader(SecurityConstants.FROM) String from); + + @GetMapping(PAY_PREFIX+"/findTaskIdByUserId") + Long findTaskIdByUserId(@RequestParam(value = "userId") Long userId, @RequestParam("isForm") Integer isForm, @RequestHeader(SecurityConstants.FROM) String from); } 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 5e5dadc1..4545176b 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 @@ -71,5 +71,10 @@ public class TaskClientFallback implements TaskClient { return null; } + @Override + public Long findTaskIdByUserId(Long userId, Integer isForm, String from) { + return null; + } + } diff --git a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/OceanEngineSync.java b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/OceanEngineSync.java index d17d0dc2..1477fc3c 100644 --- a/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/OceanEngineSync.java +++ b/ad-platform-services/ad-platform-source/src/main/java/com/baiye/task/OceanEngineSync.java @@ -9,7 +9,6 @@ import com.baiye.constant.DefaultNumberConstants; import com.baiye.constant.SecurityConstants; import com.baiye.feign.OceanEngineClient; import com.baiye.feign.TaskClient; -import com.baiye.model.dto.TaskQueryCriteria; import com.baiye.module.dao.ClueMiddleRepository; import com.baiye.module.dao.ClueRepository; import com.baiye.module.dao.OceanEngineClueIdRepository; @@ -68,15 +67,11 @@ public class OceanEngineSync { * @return */ private void getAdvertiser(Long userId, String accessToken, List advertisers) { - long taskId; - TaskQueryCriteria taskQueryCriteria = new TaskQueryCriteria(); - taskQueryCriteria.setCreateBy(userId); - taskQueryCriteria.setIsForm(3); - Set taskIdList = taskClient.queryTaskId(taskQueryCriteria).getBody(); - if (CollUtil.isEmpty(taskIdList) || taskIdList.size() != 1) { + + Long taskId = taskClient.findTaskIdByUserId(userId, 3, SecurityConstants.FROM_IN); + if (taskId == null) { return; } - taskId = taskIdList.iterator().next(); if (CollUtil.isEmpty(advertisers)) { return; } @@ -92,8 +87,9 @@ public class OceanEngineSync { map.put("advertiser_ids", advertiseList); map.put("start_time", startTime.toString()); map.put("end_time", endTime.toString()); - JSONArray array = ReqOceanEngineApi.reqOceanEngineClue(accessToken, map); log.info("=================== ocean engine request {} ===================", JSONUtil.toJsonStr(map)); + JSONArray array = ReqOceanEngineApi.reqOceanEngineClue(accessToken, map); + if (CollUtil.isEmpty(array)) { return; } @@ -101,6 +97,7 @@ public class OceanEngineSync { parseAndSaveData(userId, taskId, array); } + private boolean checkCountName(String countName) { Pattern p = Pattern.compile("[\u4e00-\u9fa5]"); Matcher m = p.matcher(countName); diff --git a/ad-platform-services/ad-platform-source/src/test/java/OceanFeiYuTest.java b/ad-platform-services/ad-platform-source/src/test/java/OceanFeiYuTest.java new file mode 100644 index 00000000..4e682fc3 --- /dev/null +++ b/ad-platform-services/ad-platform-source/src/test/java/OceanFeiYuTest.java @@ -0,0 +1,25 @@ +import com.baiye.AdPlatformSourceApplication; +import com.baiye.task.OceanEngineSync; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; + +/** + * @author wjt + * @date 2023/7/26 + */ +@SpringBootTest(classes = AdPlatformSourceApplication.class) +@RunWith(SpringRunner.class) +public class OceanFeiYuTest { + + @Resource + private OceanEngineSync oceanEngineSync; + + @Test + public void test() { + oceanEngineSync.getFeiYuSource(); + } +}