Merge remote-tracking branch 'origin/master' into feature_20260209_supeng_pattern

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/ExecutionTaskService.java

@@ -3,7 +3,6 @@ package com.tzld.piaoquan.sde.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tzld.piaoquan.sde.common.api.CommonRequest;
 import com.tzld.piaoquan.sde.model.entity.SdExecutionTask;
-import com.tzld.piaoquan.sde.model.entity.SdExecutionTaskContent;
 import com.tzld.piaoquan.sde.model.request.ExecutionTaskGetParam;
 import com.tzld.piaoquan.sde.model.request.ExecutionTaskListParam;
 import com.tzld.piaoquan.sde.model.vo.SdExecutionTaskVO;
@@ -48,7 +47,7 @@ public interface ExecutionTaskService {
      */
     void yesterdayTopReturnVideoExecutionTaskCreateHandler();
 
-    void topReturnVideoExecutionTaskCreateHandler(String params);
+    void videoExecutionTaskCreateHandler(String params);
 
     /**
      * 聚类

supply-demand-engine-core/src/main/java/com/tzld/piaoquan/sde/service/impl/ExecutionTaskServiceImpl.java

@@ -364,7 +364,7 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
     }
 
     @Override
-    public void topReturnVideoExecutionTaskCreateHandler(String params) {
+    public void videoExecutionTaskCreateHandler(String params) {
         Map<String, String> paramJson = new HashMap<>();
         try {
             paramJson = JSONObject.parseObject(params, new TypeReference<Map<String, String>>() {
@@ -375,7 +375,7 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
 
 
         long start = System.nanoTime();
-        log.info("topReturnVideoExecutionTaskCreateHandler start");
+        log.info("videoExecutionTaskCreateHandler start");
 
         String table = paramJson.getOrDefault("table", yesterdayReturnVideoTable);
         String dt = paramJson.get("dt");
@@ -383,16 +383,16 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
             LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
             dt = DateUtil.formatLocalDateTime(yesterday, "yyyyMMdd");
         }
-        String sql = "select * from " + table + " where dt='" + dt + "' ORDER BY 回流人数 DESC;";
+        String sql = "select * from " + table + " where dt='" + dt + "' ORDER BY sort_field DESC;";
         List<Record> records = odpsManager.query(sql);
         if (Objects.isNull(records) || records.isEmpty()) {
-            log.info("topReturnVideoExecutionTaskCreateHandler records is empty");
+            log.info("videoExecutionTaskCreateHandler records is empty");
             return;
         }
 
         String contentScope = paramJson.getOrDefault("contentScope", YESTERDAY_RETURN_TOP10_VIDEO_SCOPE);
 
-        XxlJobLogger.log("topReturnVideoExecutionTaskCreateHandler records size={}", records.size());
+        XxlJobLogger.log("videoExecutionTaskCreateHandler records size={}", records.size());
         List<Record> findRecords = new ArrayList<>();
         for (Record record : records) {
             if (Objects.isNull(record)) {
@@ -406,12 +406,12 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
             findRecords.add(record);
         }
         if (findRecords.isEmpty()) {
-            XxlJobLogger.log("topReturnVideoExecutionTaskCreateHandler findRecords is empty");
+            XxlJobLogger.log("videoExecutionTaskCreateHandler findRecords is empty");
             return;
         }
-        XxlJobLogger.log("topReturnVideoExecutionTaskCreateHandler findRecords size={}", findRecords.size());
+        XxlJobLogger.log("videoExecutionTaskCreateHandler findRecords size={}", findRecords.size());
         long topCostMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
-        log.info("topReturnVideoExecutionTaskCreateHandler get top video cost={}ms", topCostMs);
+        log.info("videoExecutionTaskCreateHandler get top video cost={}ms", topCostMs);
         // 创建解构任务
         int count = 0;
         for (Record record : findRecords) {
@@ -434,14 +434,14 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
                 List<SdExecutionTaskContent> contentList = new ArrayList<>();
                 contentList.add(sdExecutionTaskContent);
                 boolean createResult = executionTaskCreateService.create(sdExecutionTask, contentList);
-                log.info("topReturnVideoExecutionTaskCreateHandler sdExecutionTask create videoId = {} result={}", videoId, createResult);
+                log.info("videoExecutionTaskCreateHandler sdExecutionTask create videoId = {} result={}", videoId, createResult);
                 count++;
             } catch (Exception e) {
-                log.error("topReturnVideoExecutionTaskCreateHandler error {}", record, e);
+                log.error("videoExecutionTaskCreateHandler error {}", record, e);
             }
         }
         long costMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
-        log.info("topReturnVideoExecutionTaskCreateHandler recordSize = {}  count = {} finish cost = {}ms", records.size(), count, costMs);
+        log.info("videoExecutionTaskCreateHandler recordSize = {}  count = {} finish cost = {}ms", records.size(), count, costMs);
 
     }
 

supply-demand-engine-job/src/main/java/com/tzld/piaoquan/sde/job/ExecutionTaskJob.java

@@ -80,22 +80,20 @@ public class ExecutionTaskJob {
     }
 
     /**
-     * 昨日回流Top内容定时解构
+     * 视频定时解构
      *
-     * @param params
-     * @return
      */
-    @XxlJob("topReturnVideoExecutionTaskCreateHandler")
-    public ReturnT<String> topReturnVideoExecutionTaskCreateHandler(String params) {
-        XxlJobLogger.log("returnVideoExecutionTaskCreateHandler start");
+    @XxlJob("videoExecutionTaskCreateHandler")
+    public ReturnT<String> videoExecutionTaskCreateHandler(String params) {
+        XxlJobLogger.log("videoExecutionTaskCreateHandler start");
         try {
-            executionTaskService.topReturnVideoExecutionTaskCreateHandler(params);
+            executionTaskService.videoExecutionTaskCreateHandler(params);
         } catch (Exception e) {
-            log.error("topReturnVideoExecutionTaskCreateHandler error", e);
-            XxlJobLogger.log("topReturnVideoExecutionTaskCreateHandler error", e);
+            log.error("videoExecutionTaskCreateHandler error", e);
+            XxlJobLogger.log("videoExecutionTaskCreateHandler error", e);
             return ReturnT.FAIL;
         } finally {
-            XxlJobLogger.log("topReturnVideoExecutionTaskCreateHandler end");
+            XxlJobLogger.log("videoExecutionTaskCreateHandler end");
         }
         return ReturnT.SUCCESS;
     }