修改dmp接口

ad-platform-pojo/src/main/java/com/baiye/model/dto/TaskQueryCriteria.java

@@ -36,7 +36,7 @@ public class TaskQueryCriteria {
     @Query
     private Integer isForm;
 
-    @Query(type = Query.Type.IN)
+    @Query(propName ="isForm",type = Query.Type.IN)
     private List<Integer> isForms;
 
     @Query(type = Query.Type.BETWEEN)

manage/ad-platform-management/src/main/java/com/baiye/modules/system/httpRequest/AdBackRequestApi.java

@@ -4,6 +4,7 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
 import java.util.List;
@@ -15,6 +16,7 @@ import java.util.Map;
  * 请求ad_back 将任务对应的tag值传过去
  */
 @Slf4j
+@Component
 public class AdBackRequestApi {
     @Value("${ad-back.url}")
     private String url;

manage/ad-platform-management/src/main/java/com/baiye/modules/system/rest/TaskController.java

@@ -102,7 +102,7 @@ public class TaskController {
         return CommonResponse.createBySuccessMessage("操作成功");
     }
 
-    @ApiOperation("新建ad-back任务")
+    @ApiOperation("新建dmp任务")
     @PostMapping("/saveAdBackTask")
     public ResponseEntity<Object> saveAdBackTask(@RequestBody @Validated TaskTagDto taskTagDto) {
         taskService.saveAdBackTask(taskTagDto);

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/dto/TaskTagDto.java

@@ -24,6 +24,15 @@ public class TaskTagDto {
      */
     @NotNull
     private Long userId;
+    /**
+     * tag值
+     */
     @NotNull
     private List<String> tagStr;
+    /**
+     * 标签组id
+     */
+    private Long labelOrganizeId;
+
+    private String remake;
 }

manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/TaskServiceImpl.java

@@ -101,7 +101,8 @@ public class TaskServiceImpl implements TaskService {
      */
     @Override
     public void saveAdBackTask(TaskTagDto taskTagDto) {
-        Long taskId = createTask(taskTagDto.getUserId(), taskTagDto.getTaskName(), DefaultNumberConstants.FOUR_NUMBER);
+        Long taskId = createTask(taskTagDto.getUserId(), taskTagDto.getTaskName(), DefaultNumberConstants.FOUR_NUMBER, taskTagDto.getLabelOrganizeId(), taskTagDto
+                .getRemake());
         //推送到ad-bask
         adBackRequestApi.sendTag(taskId, taskTagDto.getUserId(), taskTagDto.getTagStr());
     }
@@ -111,7 +112,7 @@ public class TaskServiceImpl implements TaskService {
      *
      * @param username
      */
-    private Long createTask(Long id, String username, Integer isForm) {
+    private Long createTask(Long id, String username, Integer isForm, Long labelOrganizeId, String remake) {
         Long taskId = IdUtil.getSnowflake(9, 9).nextId();
         Task task = new Task();
         task.setId(taskId);
@@ -122,7 +123,14 @@ public class TaskServiceImpl implements TaskService {
         task.setTaskType(DefaultNumberConstants.ONE_NUMBER);
         task.setIsForm(isForm);
         task.setCreateBy(id);
-        task.setLabelOrganizeId(null);
+        if (labelOrganizeId != null) {
+            List<String> labelList = labelService.findLabelList(labelOrganizeId);
+            if (CollUtil.isNotEmpty(labelList)) {
+                task.setBaseLabel(labelList);
+            }
+        }
+        task.setLabelOrganizeId(labelOrganizeId);
+        task.setRemark(remake);
         Task save = taskRepository.save(task);
         return save.getId();
     }

services/ad-platform-source/src/main/java/com/baiye/module/dao/ClueJpa.java

@@ -299,6 +299,8 @@ public class ClueJpa {
         List<Timestamp> createTimeList = clueQueryCriteria.getCreateTime();
         Integer clueStage = clueQueryCriteria.getClueStage();
         List<Long> userIdList = clueQueryCriteria.getUserIdList();
+        Integer clueType = clueQueryCriteria.getClueType();
+
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT tc.id as id,tc.nid as nid,tc.audio_url as audioUrl,tc.create_time as createTime,tc.name as name,tc.origin as origin,tc.cast_info as castInfo , tcm.task_id as taskId,tcm.member_status as memberStatus," +
                 "tcm.clue_stage as clueStage,tcm.clue_call_status as clueCallStatus,tcm.member_id as memberId,tcm.source_label as sourceLabel ,tcm.turnover_amount as turnoverAmount " +
@@ -329,7 +331,11 @@ public class ClueJpa {
             if (createTimeList != null && createTimeList.size() == 2) {
                 sql.append("and tc.create_time between :createTimeBegin and :createTimeEnd ");
             }
-
+            if (clueType != null) {
+                sql.append("AND tcm.clue_type = :clueType ");
+            } else {
+                sql.append("AND tcm.clue_type < :clueType ");
+            }
             //拼接最后加入时间排序,没加id排序出现数据重复问题(注意空格)
             sql.append("ORDER BY tc.create_time desc ,tc.id ");
             sql.append("LIMIT :number,:size ");
@@ -357,6 +363,11 @@ public class ClueJpa {
             if (userIdList != null && userIdList.size() > 0) {
                 query.setParameter("userIdList", userIdList);
             }
+            if (clueType != null) {
+                query.setParameter("clueType", clueType);
+            } else {
+                query.setParameter("clueType", DefaultNumberConstants.FOUR_NUMBER);
+            }
             query.setParameter("number", pageable.getPageNumber() * pageable.getPageSize());
             query.setParameter("size", pageable.getPageSize());
         }
@@ -407,6 +418,7 @@ public class ClueJpa {
         List<Long> userIdList = clueQueryCriteria.getUserIdList();
         Integer clueStage = clueQueryCriteria.getClueStage();
         List<Timestamp> createTimeList = clueQueryCriteria.getCreateTime();
+        Integer clueType = clueQueryCriteria.getClueType();
         StringBuilder sql = new StringBuilder("select count(*) as countNum from tb_clue as c LEFT JOIN tb_clue_middle as cm on c.id = cm.clue_id where 1=1  ");
         if (CollUtil.isNotEmpty(taskIds)) {
             sql.append("AND cm.task_id IN (:taskId) ");
@@ -433,6 +445,11 @@ public class ClueJpa {
             if (clueStage != null) {
                 sql.append("AND cm.clue_stage = :clueStage ");
             }
+            if (clueType != null) {
+                sql.append("AND cm.clue_type = :clueType ");
+            } else {
+                sql.append("AND cm.clue_type < :clueType ");
+            }
         }
         Query query = entityManager.createNativeQuery(sql.toString());
         if (CollUtil.isNotEmpty(taskIds)) {
@@ -455,7 +472,11 @@ public class ClueJpa {
             if (userIdList != null && userIdList.size() > 0) {
                 query.setParameter("userIdList", userIdList);
             }
-
+            if (clueType != null) {
+                query.setParameter("clueType", clueType);
+            } else {
+                query.setParameter("clueType", DefaultNumberConstants.FOUR_NUMBER);
+            }
         }
         query.unwrap(NativeQuery.class).setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
         List confirmReceipt = query.getResultList();