upload,download,status

src/main/java/com/glxp/api/idc/controller/IdcController.java

@@ -77,7 +77,17 @@ public class IdcController {
     public BaseResponse download(HttpServletRequest request, @RequestBody Map<String, Object> params) {
         return idcService.download(request, params);
     }
-
+    @RequestMapping(value = "/spssync/common/uploadStatus")
+    @ResponseBody
+    public BaseResponse uploadStatus(HttpServletRequest request, @RequestBody Map<String, Object> params) {
+        return idcService.uploadStatus(request, params);
+    }
+    
+    @RequestMapping(value = "/spssync/common/downloadStatus")
+    @ResponseBody
+    public BaseResponse downloadStatus(HttpServletRequest request, @RequestBody Map<String, Object> params) {
+        return idcService.downloadStatus(request, params);
+    }
     //@Log("数据同步任务根据任务ID,返回下载成功标记")
     @RequestMapping(value = "/spssync/common/success")
     @ResponseBody

src/main/java/com/glxp/api/idc/service/IdcService.java

@@ -25,7 +25,8 @@ public interface IdcService {
 	BaseResponse taskList(HttpServletRequest request,Map<String,Object> params);
 	
 	BaseResponse download(HttpServletRequest request,Map<String,Object> params);
-	
+	BaseResponse uploadStatus(HttpServletRequest request,Map<String,Object> params);
+	BaseResponse downloadStatus(HttpServletRequest request,Map<String,Object> params);
 	public void asyncFetchTask();
 	public void asyncFetchUdiTask();
 

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<String, Object> params) {
-        String id = "";
+    	return statusFile(params,"basic_export_status");
-        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) {
+    @Override
-            id = params.get("taskId").toString();
+    public BaseResponse uploadStatus(HttpServletRequest request, Map<String, Object> params) {
-        } else {
+    	return statusFile(params,"basic_upload_status");
-            id = params.get("id").toString();
+    }
-        }
+    @Override
-
+    public BaseResponse downloadStatus(HttpServletRequest request, Map<String, Object> params) {
-
+    	return statusFile(params,"basic_download_status");
-        Map<String, Object> map = map = dbDao.get("select * from " + tableName + " where id='" + id + "'");
+    }
-
+    private BaseResponse statusFile(Map<String,Object> params,String tableName) {
-        if (map == null)
+    	String id = "";
-            return ResultVOUtils.error(9000, "下载任务不存在");
+    	 if (params.containsKey("taskId") && params.get("taskId") != null) {
-        if (!(map.get("cacheFilePath") != null && FileUtils.isFileExist(map.get("cacheFilePath").toString())))
+             id = params.get("taskId").toString();
-            return ResultVOUtils.error(9000, "下载文件不存在");
+         } else {
-        String json = FileUtils.readFileAll(map.get("cacheFilePath").toString());
+             id = params.get("id").toString();
-
+         }
-        JSONObject object = JSON.parseObject(json);
+
-        if (object == null)
+         Map<String, Object> map = map = dbDao.get("select * from " + tableName + " where id='" + id + "'");
-            return ResultVOUtils.error(9000, "任务下载失败");
+
-        if (object != null && object.getInteger("code") != null) {
+         if (map == null)
-            BaseResponse response = JSON.parseObject(json, BaseResponse.class);
+         	return ResultVOUtils.error(9000, "下载任务不存在"+tableName);
-            return response;
+         if (!(map.get("cacheFilePath") != null && FileUtils.isFileExist(map.get("cacheFilePath").toString())))
-        }
+             return ResultVOUtils.error(9000, "下载文件不存在-"+tableName);
-
+         String json = FileUtils.readFileAll(map.get("cacheFilePath").toString());
-        return ResultVOUtils.success(object);
+
+         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);
     }