From 19fff9038b4aff46a44d9c9c91dde8bb082f617c Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 2 Apr 2023 12:45:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/idc/service/impl/IdcServiceImpl.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 b5bf537f8..dc86c14e8 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 @@ -108,7 +108,13 @@ public class IdcServiceImpl implements IdcService { if(map==null) ResultVOUtils.error(9000, "下载任务不存在"); String json = FileUtils.readFileAll(map.get("cacheFilePath").toString()); + logger.info("download-->"+json); JSONObject object = JSON.parseObject(json); + if(object!=null&&object.getInteger("code")==20000) { + BaseResponse response = JSON.parseObject(json,BaseResponse.class); + return response; + } + return ResultVOUtils.success(object); } @@ -130,7 +136,6 @@ public class IdcServiceImpl implements IdcService { @Async @Override public void asyncFetchUdiTask() { - logger.info("UDI管理系统拉取任务开始--------"); fetchTask(false); } @Async @@ -598,7 +603,15 @@ public class IdcServiceImpl implements IdcService { /*解析到数据库*/ private boolean analyToDB(JSONObject jsonObject,MultipartFile[] files) { if(!StringUtils.isEmpty(jsonObject.getString("tableName"))) { - List> list = jsonObject.getObject("data", List.class); + JSONObject object = jsonObject.getJSONObject("data"); + List> list = new ArrayList<>(); + + if(object instanceof List) { + list = jsonObject.getObject("data", List.class); + } else { + if(object.get("data")!=null) + list = object.getObject("data", List.class); + } return analyData(jsonObject.getString("tableName"),jsonObject.getString("uniqueColumn"),list); //图片处理 }