diff --git a/src/main/java/com/glxp/api/idc/controller/IdcController.java b/src/main/java/com/glxp/api/idc/controller/IdcController.java index 8b207a89..13a386a2 100644 --- a/src/main/java/com/glxp/api/idc/controller/IdcController.java +++ b/src/main/java/com/glxp/api/idc/controller/IdcController.java @@ -77,7 +77,17 @@ public class IdcController { public BaseResponse download(HttpServletRequest request, @RequestBody Map params) { return idcService.download(request, params); } - + @RequestMapping(value = "/spssync/common/uploadStatus") + @ResponseBody + public BaseResponse uploadStatus(HttpServletRequest request, @RequestBody Map params) { + return idcService.uploadStatus(request, params); + } + + @RequestMapping(value = "/spssync/common/downloadStatus") + @ResponseBody + public BaseResponse downloadStatus(HttpServletRequest request, @RequestBody Map params) { + return idcService.downloadStatus(request, params); + } //@Log("数据同步任务根据任务ID,返回下载成功标记") @RequestMapping(value = "/spssync/common/success") @ResponseBody diff --git a/src/main/java/com/glxp/api/idc/service/IdcService.java b/src/main/java/com/glxp/api/idc/service/IdcService.java index 219826c8..ca4459ec 100644 --- a/src/main/java/com/glxp/api/idc/service/IdcService.java +++ b/src/main/java/com/glxp/api/idc/service/IdcService.java @@ -25,7 +25,8 @@ public interface IdcService { BaseResponse taskList(HttpServletRequest request,Map params); BaseResponse download(HttpServletRequest request,Map params); - + BaseResponse uploadStatus(HttpServletRequest request,Map params); + BaseResponse downloadStatus(HttpServletRequest request,Map params); public void asyncFetchTask(); public void asyncFetchUdiTask(); diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index c908f97f..4262df95 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -93,34 +93,44 @@ public class IdcServiceImpl implements IdcService { return ResultVOUtils.success(list); } + /*下载任务*/ @Override public BaseResponse download(HttpServletRequest request, Map params) { - String id = ""; - String tableName = params.get("scheduleType") != null && params.get("scheduleType").equals("3") ? "basic_export_status" : "basic_export_status"; - if (params.containsKey("taskId") && params.get("taskId") != null) { - id = params.get("taskId").toString(); - } else { - id = params.get("id").toString(); - } - - - Map map = map = dbDao.get("select * from " + tableName + " where id='" + id + "'"); - - if (map == null) - return ResultVOUtils.error(9000, "下载任务不存在"); - if (!(map.get("cacheFilePath") != null && FileUtils.isFileExist(map.get("cacheFilePath").toString()))) - return ResultVOUtils.error(9000, "下载文件不存在"); - String json = FileUtils.readFileAll(map.get("cacheFilePath").toString()); - - JSONObject object = JSON.parseObject(json); - if (object == null) - return ResultVOUtils.error(9000, "任务下载失败"); - if (object != null && object.getInteger("code") != null) { - BaseResponse response = JSON.parseObject(json, BaseResponse.class); - return response; - } - - return ResultVOUtils.success(object); + return statusFile(params,"basic_export_status"); + } + @Override + public BaseResponse uploadStatus(HttpServletRequest request, Map params) { + return statusFile(params,"basic_upload_status"); + } + @Override + public BaseResponse downloadStatus(HttpServletRequest request, Map params) { + return statusFile(params,"basic_download_status"); + } + private BaseResponse statusFile(Map params,String tableName) { + String id = ""; + if (params.containsKey("taskId") && params.get("taskId") != null) { + id = params.get("taskId").toString(); + } else { + id = params.get("id").toString(); + } + + Map map = map = dbDao.get("select * from " + tableName + " where id='" + id + "'"); + + if (map == null) + return ResultVOUtils.error(9000, "下载任务不存在"+tableName); + if (!(map.get("cacheFilePath") != null && FileUtils.isFileExist(map.get("cacheFilePath").toString()))) + return ResultVOUtils.error(9000, "下载文件不存在-"+tableName); + String json = FileUtils.readFileAll(map.get("cacheFilePath").toString()); + + JSONObject object = JSON.parseObject(json); + if (object == null) + return ResultVOUtils.error(9000, "任务下载失败"); + if (object != null && object.getInteger("code") != null) { + BaseResponse response = JSON.parseObject(json, BaseResponse.class); + return response; + } + + return ResultVOUtils.success(object); }