From 9a154b6379f0bed8196964959822fa6a1a3f6d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E8=B1=AA?= <1437200870@qq.com>
Date: Mon, 9 Sep 2024 15:05:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=BA=BF=E7=A8=8B=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/task/feign/DataValueClient.java  |  5 ++--
 .../feign/factory/DataValueClientFactory.java |  2 +-
 .../muyu/service/impl/TaskServiceImpl.java    | 24 +++++++++----------
 .../com/muyu/task/PriorityThreadPool.java     |  1 -
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueClient.java b/cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueClient.java
index 07c27e7..e4ad6cd 100644
--- a/cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueClient.java
+++ b/cloud-task-remote/src/main/java/com/muyu/task/feign/DataValueClient.java
@@ -2,7 +2,6 @@ package com.muyu.task.feign;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.domain.DataValue;
-import com.muyu.task.feign.config.CustomFeignConfig;
 import com.muyu.task.feign.factory.DataValueClientFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,7 +18,7 @@ import java.util.List;
  * @date: 2024/9/4 15:13
  */
 //,fallback = TaskFeignFallback.class
-@FeignClient(name = "cloud-source",fallbackFactory = DataValueClientFactory.class,configuration = CustomFeignConfig.class )
+@FeignClient(name = "cloud-source",fallbackFactory = DataValueClientFactory.class )
 public interface DataValueClient {
 
     /**
@@ -49,7 +48,7 @@ public interface DataValueClient {
 
     //二维数组查询
     @PostMapping("/DataValue/findTableValueToArray")
-    public DataValue[][] findTableValueToArray(@RequestParam("basicId") Long basicId, @RequestParam("sql") String sql, @RequestParam("one") Long one, @RequestParam("two") Integer two);
+    public Result<DataValue[][]> findTableValueToArray(@RequestParam("basicId") Long basicId, @RequestParam("sql") String sql, @RequestParam("one") Long one, @RequestParam("two") Integer two);
 
 
     //添加数据值
diff --git a/cloud-task-remote/src/main/java/com/muyu/task/feign/factory/DataValueClientFactory.java b/cloud-task-remote/src/main/java/com/muyu/task/feign/factory/DataValueClientFactory.java
index 00e7346..c3ecc04 100644
--- a/cloud-task-remote/src/main/java/com/muyu/task/feign/factory/DataValueClientFactory.java
+++ b/cloud-task-remote/src/main/java/com/muyu/task/feign/factory/DataValueClientFactory.java
@@ -38,7 +38,7 @@ public class DataValueClientFactory implements FallbackFactory<DataValueClient>
             }
 
             @Override
-            public DataValue[][] findTableValueToArray(Long basicId, String sql, Long one, Integer two) {
+            public Result<DataValue[][]> findTableValueToArray(Long basicId, String sql, Long one, Integer two) {
                 return null;
             }
 
diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
index 0ce0068..242dc63 100644
--- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
+++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java
@@ -237,21 +237,21 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, TaskInfo> implement
         log.info("开始查询数据");
         log.info("sql{}", sql);
         log.info("数组为{}，，{}", finalFirstArray, two);
-        DataValue[][] tableValue = dataValueClient.findTableValueToArray(databaseId, sql, finalFirstArray, two);
-        System.out.println("aaa"+tableValue.length);
-        System.out.println("aaa"+tableValue.length);
-        System.out.println("aaa"+tableValue.length);
-        System.out.println("aaa"+tableValue.length);
-        log.info("远程调用完毕,调用数量{}", tableValue.length);
-        for (DataValue[] dataValues : tableValue) {
-            for (DataValue dataValue : dataValues) {
-                String key = dataValue.getKey();
+        Result<DataValue[][]> result = dataValueClient.findTableValueToArray(databaseId, sql, finalFirstArray, two);
+        DataValue[][] dataValues = result.getData();
+        System.out.println("aaa"+dataValues.length);
+        System.out.println("aaa"+dataValues.length);
+        System.out.println("aaa"+dataValues.length);
+        log.info("远程调用完毕,调用数量{}", dataValues.length);
+        for (DataValue[] dataValue : dataValues) {
+            for (DataValue dataValue1 : dataValue) {
+                String key = dataValue1.getKey();
                 String newKey = newAndOldMap.get(key);
-                dataValue.setKey(newKey);
+                dataValue1.setKey(newKey);
             }
         }
-        Result result = dataValueClient.addProduct(basicId, tableId, tableValue);
-        log.info("添加结果为{}", result);
+        Result results = dataValueClient.addProduct(basicId, tableId, dataValues);
+        log.info("添加结果为{}", results);
         log.info("添加到queue里成功");
     }
 
diff --git a/cloud-task-server/src/main/java/com/muyu/task/PriorityThreadPool.java b/cloud-task-server/src/main/java/com/muyu/task/PriorityThreadPool.java
index a4e8875..774d872 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/PriorityThreadPool.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/PriorityThreadPool.java
@@ -298,7 +298,6 @@ public class PriorityThreadPool {
                 try {
                     log.info("开始执行任务");
                     task.run();
-
                 } finally {
                     log.info("执行任务完毕？？");
                     lowPrioritySemaphore.release();