Ver código fonte

feat:添加日志

zhaohaipeng 3 semanas atrás
pai
commit
dd13105c9d

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

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.sde.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tzld.piaoquan.sde.common.api.CommonRequest;
 import com.tzld.piaoquan.sde.model.entity.SdExecutionTask;
@@ -54,6 +55,6 @@ public interface ExecutionTaskService {
      */
     void manualClusterExecutionTaskCreateHandler(String params);
 
-    void batchCreateDeconstructTask(String dtList, String contentScope);
+    void batchCreateDeconstructTask(CommonRequest<JSONObject> request);
 
 }

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

@@ -36,6 +36,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -544,14 +545,24 @@ public class ExecutionTaskServiceImpl implements ExecutionTaskService {
     }
 
     @Override
-    public void batchCreateDeconstructTask(String dtList, String contentScope) {
-        if (StringUtils.isEmpty(dtList)) {
+    public void batchCreateDeconstructTask(CommonRequest<JSONObject> request) {
+        if (Objects.isNull(request.getParams()) || request.getParams().isEmpty()) {
             return;
         }
 
-        List<String> dts = Arrays.stream(dtList.split(","))
-                .filter(StringUtils::isNotEmpty)
+        JSONObject requestParamJson = request.getParams();
+        String contentScope = requestParamJson.getString("contentScope");
+        String dtListStr = requestParamJson.getString("dts");
+        if (StringUtils.isBlank(dtListStr) || StringUtils.isBlank(contentScope)) {
+            return;
+        }
+
+        List<String> dts = Arrays.stream(dtListStr.split(","))
+                .filter(StringUtils::isBlank)
                 .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(dts)) {
+            return;
+        }
 
         log.info("batchCreateDeconstructTask: {}", dts);
 

+ 4 - 3
supply-demand-engine-service/src/main/java/com/tzld/piaoquan/sde/controller/ExecutionTaskController.java

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.sde.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.tzld.piaoquan.sde.common.api.CommonRequest;
 import com.tzld.piaoquan.sde.common.api.CommonResponse;
@@ -43,9 +44,9 @@ public class ExecutionTaskController {
     }
 
     @Operation(summary = "批量创建解构任务")
-    @GetMapping("/batchCreateDeconstructTask")
-    public CommonResponse<Void> batchCreateDeconstructTask(@RequestParam(value = "dtList") String dtList, @RequestParam(value = "contentScope") String contentScope) {
-        executionTaskService.batchCreateDeconstructTask(dtList, contentScope);
+    @PostMapping("/batchCreateDeconstructTask")
+    public CommonResponse<Void> batchCreateDeconstructTask(@RequestBody CommonRequest<JSONObject> request) {
+        executionTaskService.batchCreateDeconstructTask(request);
         return CommonResponse.create();
     }
 }

+ 4 - 4
supply-demand-engine-service/src/test/java/com/tzld/piaoquan/sde/ExecutionTaskServiceTest.java

@@ -10,9 +10,9 @@ public class ExecutionTaskServiceTest extends BaseTest {
     @Autowired
     private ExecutionTaskService executionTaskService;
 
-    @Test
-    public void test() {
-        executionTaskService.batchCreateDeconstructTask("20260124", "yesterday_exp_top200_video_scope");
-    }
+    // @Test
+    // public void test() {
+        // executionTaskService.batchCreateDeconstructTask("20260124", "yesterday_exp_top200_video_scope");
+    // }
 
 }