From e3dd8a00672cb4677e5cee3b6c3d8dda9bd7839b Mon Sep 17 00:00:00 2001
From: chengqf <584883665@139.com>
Date: Sun, 9 Apr 2023 22:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0download=5Fstatus,uplaod=5Fst?=
 =?UTF-8?q?atus=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/idc/controller/IdcController.java   | 12 ++++
 .../sale/admin/idc/service/IdcService.java    |  3 +-
 .../idc/service/impl/IdcServiceImpl.java      | 62 +++++++++++--------
 3 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java
index dd3fd61..f2f4ca9 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/controller/IdcController.java
@@ -93,6 +93,18 @@ public class IdcController {
         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
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java
index 9586871..7b7b9a4 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/IdcService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/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();
 
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java
index bea9fec..d4307fb 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/idc/service/impl/IdcServiceImpl.java
@@ -97,33 +97,43 @@ public class IdcServiceImpl implements IdcService {
     /*下载任务*/
     @Override
     public BaseResponse download(HttpServletRequest request, Map<String, Object> 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<String, Object> 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<String, Object> params) {
+    	return statusFile(params,"basic_upload_status");
+    }
+    @Override
+    public BaseResponse downloadStatus(HttpServletRequest request, Map<String, Object> params) {
+    	return statusFile(params,"basic_download_status");
+    }
+    private BaseResponse statusFile(Map<String,Object> 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<String, Object> 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);
+    }
+    
 
     /*UDI系统上传自助平台*/
     @Override