|
|
|
@ -31,7 +31,6 @@ import com.baiye.util.RedisUtils;
|
|
|
|
|
import com.baiye.util.SecurityUtils;
|
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
|
|
import org.springframework.cache.annotation.CachePut;
|
|
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
|
|
import org.springframework.data.domain.PageRequest;
|
|
|
|
@ -91,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());
|
|
|
|
|
.getRemark(),taskTagDto.getIsDmpDelivery());
|
|
|
|
|
// 推送到adbask
|
|
|
|
|
List<String> collect = taskTagDto.getTagStr().stream().map(String::trim).collect(Collectors.toList());
|
|
|
|
|
adBackRequestApi.sendTag(taskId, taskTagDto.getUserId(), collect);
|
|
|
|
@ -120,6 +119,12 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
if (CollUtil.isNotEmpty(tag)) {
|
|
|
|
|
return CommonResponse.createBySuccess(tag);
|
|
|
|
|
}
|
|
|
|
|
Task task = taskRepository.findById(taskTagDto.getTaskId()).orElseGet(Task::new);
|
|
|
|
|
if (task.getIsDmpDelivery() != null
|
|
|
|
|
&& !task.getIsDmpDelivery().equals(taskTagDto.getIsDmpDelivery())){
|
|
|
|
|
task.setIsDmpDelivery(taskTagDto.getIsDmpDelivery());
|
|
|
|
|
taskRepository.save(task);
|
|
|
|
|
}
|
|
|
|
|
List<String> collect = taskTagDto.getTagStr().stream().map(String::trim).collect(Collectors.toList());
|
|
|
|
|
adBackRequestApi.sendTag(taskTagDto.getTaskId(), taskTagDto.getUserId(), collect);
|
|
|
|
|
return CommonResponse.createBySuccess();
|
|
|
|
@ -158,7 +163,7 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void createTask(Long taskId, Long id, String taskName, Integer isForm, Long labelOrganizeId, String remark) {
|
|
|
|
|
private void createTask(Long taskId, Long id, String taskName, Integer isForm, Long labelOrganizeId, String remark, Boolean isDmpDelivery) {
|
|
|
|
|
Task task = new Task();
|
|
|
|
|
task.setId(taskId);
|
|
|
|
|
task.setEncryptionType(DefaultNumberConstants.ZERO_NUMBER);
|
|
|
|
@ -169,6 +174,7 @@ public class TaskServiceImpl implements TaskService {
|
|
|
|
|
task.setCreateBy(id);
|
|
|
|
|
task.setRemark(remark);
|
|
|
|
|
task.setTaskName(taskName);
|
|
|
|
|
task.setIsDmpDelivery(isDmpDelivery);
|
|
|
|
|
taskRepository.save(task);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|