diff --git a/src/main/java/org/fedai/fate/board/controller/JobDetailController.java b/src/main/java/org/fedai/fate/board/controller/JobDetailController.java index fb4e0c6c6..4c50aeaff 100644 --- a/src/main/java/org/fedai/fate/board/controller/JobDetailController.java +++ b/src/main/java/org/fedai/fate/board/controller/JobDetailController.java @@ -417,7 +417,6 @@ public ResponseResult getDagDependencies(String param) { @ResponseBody public ResponseResult getModel(@Valid @RequestBody ComponentQueryDTO componentQueryDTO, BindingResult bindingResult) { - if (bindingResult.hasErrors()) { FieldError errors = bindingResult.getFieldError(); return new ResponseResult<>(ErrorCode.ERROR_PARAMETER, errors.getDefaultMessage()); @@ -434,11 +433,11 @@ public ResponseResult getModel(@Valid @RequestBody ComponentQueryDTO componentQu JSONObject resultObject = JSON.parseObject(result); Integer retCode = resultObject.getInteger(Dict.CODE); + Object o = resultObject.get(Dict.DATA); if (retCode != 0) { return ResponseUtil.buildResponse(null, null); } - - return ResponseUtil.buildResponse(result, null); + return new ResponseResult(ErrorCode.SUCCESS.getCode(), resultObject.get(Dict.DATA)); } @RequestMapping(value = "/tracking/component/output/data", method = RequestMethod.POST) diff --git a/src/main/java/org/fedai/fate/board/global/Dict.java b/src/main/java/org/fedai/fate/board/global/Dict.java index 6431807a4..3fe7e080f 100644 --- a/src/main/java/org/fedai/fate/board/global/Dict.java +++ b/src/main/java/org/fedai/fate/board/global/Dict.java @@ -81,7 +81,7 @@ public class Dict { static public final String URL_JOB_STOP = "/v2/job/stop"; static public final String URL_JOB_QUERY = "/v2/job/list/query"; static public final String URL_JOB_DATAVIEW = "/v2/job/query"; - static public final String URL_JOB_UPDATE = "/v2/job/update"; + static public final String URL_JOB_UPDATE = "/v2/job/notes/add"; static public final String URL_JOB_RERUN = "/v2/job/rerun"; static public final String URL_DAG_DEPENDENCY = "/v2/job/dag/dependency"; static public final String URL_TASK_QUERY = "/v2/job/task/list/query"; diff --git a/src/main/java/org/fedai/fate/board/services/JobManagerService.java b/src/main/java/org/fedai/fate/board/services/JobManagerService.java index ffb9d0755..06e7a77dc 100644 --- a/src/main/java/org/fedai/fate/board/services/JobManagerService.java +++ b/src/main/java/org/fedai/fate/board/services/JobManagerService.java @@ -73,7 +73,7 @@ public class JobManagerService { public List queryJobStatus() { Map param = new HashMap<>(); List statusList = new ArrayList<>(); - statusList.add(Dict.STATUS_JOB_WAITING); +// statusList.add(Dict.STATUS_JOB_WAITING); statusList.add(Dict.STATUS_JOB_RUNNING); String statusStr = String.join(",", statusList);