From b54954f81012cd7d1be7b30146d9eb348258d1d6 Mon Sep 17 00:00:00 2001
From: WenYongbin <1977763549@qq.com>
Date: Mon, 16 Mar 2026 14:59:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A2=85=E5=B7=9E=E4=B8=89=E9=99=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=9C=80=E6=96=B0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/docus/server/mzsy/job/MzsyReportCollectJob.java  | 6 +++---
 .../java/com/docus/server/rpc/TaskDistributeService.java | 9 +++++++++
 .../docus/server/rpc/impl/TaskDistributeServiceImpl.java | 7 +++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
index 25c882e..bf7079f 100644
--- a/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
+++ b/src/main/java/com/docus/server/mzsy/job/MzsyReportCollectJob.java
@@ -68,7 +68,7 @@ public class MzsyReportCollectJob {
             return;
         }
 
-        CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId);
+        CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getTaskByCollectorId(collectorId);
         if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode())
                 && commonResult.getData() != null) {
             ReportDownTwoDto downTwoDto = commonResult.getData();
@@ -180,7 +180,7 @@ public class MzsyReportCollectJob {
             return;
         }
 
-        CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId);
+        CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getTaskByCollectorId(collectorId);
         if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode())
                 && commonResult.getData() != null) {
             ReportDownTwoDto downTwoDto = commonResult.getData();
@@ -243,7 +243,7 @@ public class MzsyReportCollectJob {
                 return;
             }
 
-            CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId);
+            CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getTaskByCollectorId(collectorId);
             if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode())
                     && commonResult.getData() != null) {
                 ReportDownTwoDto downTwoDto = commonResult.getData();
diff --git a/src/main/java/com/docus/server/rpc/TaskDistributeService.java b/src/main/java/com/docus/server/rpc/TaskDistributeService.java
index 774920a..32d1d52 100644
--- a/src/main/java/com/docus/server/rpc/TaskDistributeService.java
+++ b/src/main/java/com/docus/server/rpc/TaskDistributeService.java
@@ -20,5 +20,14 @@ public interface TaskDistributeService {
      */
     CommonResult<ReportDownTwoDto> getNoViewTaskByCollectorId(String collectorId);
 
+
+    /**
+     *
+     * 新版任务平台，格努采集器类型获取任务
+     */
+    CommonResult<ReportDownTwoDto> getTaskByCollectorId(String collectorId);
+
+
+
     CommonResult<String> cancel(Long taskId);
 }
diff --git a/src/main/java/com/docus/server/rpc/impl/TaskDistributeServiceImpl.java b/src/main/java/com/docus/server/rpc/impl/TaskDistributeServiceImpl.java
index c105ddb..597edfa 100644
--- a/src/main/java/com/docus/server/rpc/impl/TaskDistributeServiceImpl.java
+++ b/src/main/java/com/docus/server/rpc/impl/TaskDistributeServiceImpl.java
@@ -33,6 +33,13 @@ public class TaskDistributeServiceImpl implements TaskDistributeService {
         });
     }
 
+    @Override
+    public CommonResult<ReportDownTwoDto> getTaskByCollectorId(String collectorId) {
+        String getTaskUrl = serverUrlConfig.getTaskDistributeServerUrl() + "api/task/dispose/getTask?collectid=" + collectorId;
+        String result = HttpUtil.get(getTaskUrl);
+        return Func.readJson(result, new TypeReference<CommonResult<ReportDownTwoDto>>() {
+        });
+    }
 
     @Override
     public CommonResult<String> cancel(Long taskId) {