fix: 梅州三院,更新最新任务平台。

master
WenYongbin 1 month ago
parent 933e72bcd9
commit b54954f810

@ -68,7 +68,7 @@ public class MzsyReportCollectJob {
return; return;
} }
CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId); CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getTaskByCollectorId(collectorId);
if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode()) if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode())
&& commonResult.getData() != null) { && commonResult.getData() != null) {
ReportDownTwoDto downTwoDto = commonResult.getData(); ReportDownTwoDto downTwoDto = commonResult.getData();
@ -180,7 +180,7 @@ public class MzsyReportCollectJob {
return; return;
} }
CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId); CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getTaskByCollectorId(collectorId);
if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode()) if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode())
&& commonResult.getData() != null) { && commonResult.getData() != null) {
ReportDownTwoDto downTwoDto = commonResult.getData(); ReportDownTwoDto downTwoDto = commonResult.getData();
@ -243,7 +243,7 @@ public class MzsyReportCollectJob {
return; return;
} }
CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId); CommonResult<ReportDownTwoDto> commonResult = taskDistributeService.getTaskByCollectorId(collectorId);
if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode()) if (ResultCode.SUCCESS.getCode().equals(commonResult.getCode())
&& commonResult.getData() != null) { && commonResult.getData() != null) {
ReportDownTwoDto downTwoDto = commonResult.getData(); ReportDownTwoDto downTwoDto = commonResult.getData();

@ -20,5 +20,14 @@ public interface TaskDistributeService {
*/ */
CommonResult<ReportDownTwoDto> getNoViewTaskByCollectorId(String collectorId); CommonResult<ReportDownTwoDto> getNoViewTaskByCollectorId(String collectorId);
/**
*
*
*/
CommonResult<ReportDownTwoDto> getTaskByCollectorId(String collectorId);
CommonResult<String> cancel(Long taskId); CommonResult<String> cancel(Long taskId);
} }

@ -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 @Override
public CommonResult<String> cancel(Long taskId) { public CommonResult<String> cancel(Long taskId) {

Loading…
Cancel
Save