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 commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId); + CommonResult 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 commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId); + CommonResult 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 commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId); + CommonResult 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 getNoViewTaskByCollectorId(String collectorId); + + /** + * + * 新版任务平台,格努采集器类型获取任务 + */ + CommonResult getTaskByCollectorId(String collectorId); + + + CommonResult 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 getTaskByCollectorId(String collectorId) { + String getTaskUrl = serverUrlConfig.getTaskDistributeServerUrl() + "api/task/dispose/getTask?collectid=" + collectorId; + String result = HttpUtil.get(getTaskUrl); + return Func.readJson(result, new TypeReference>() { + }); + } @Override public CommonResult cancel(Long taskId) {