From 062def2485d189678a888487943764ba14adce66 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 2 Apr 2023 16:00:50 +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 --- .../glxp/api/idc/service/impl/IdcServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 e1ce90e0..9b33b5e0 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 @@ -552,7 +552,7 @@ public class IdcServiceImpl implements IdcService { } } else { success = false; - saveIdcLog(messageType,"",tableName +">fail:上传地址未连通",i *limit,total); + saveIdcLog(messageType,"",syncIp+":"+tableName +">fail:上传地址未连通",i *limit,total); } } else { if(!StringUtils.isEmpty(recordSql)) { @@ -602,16 +602,22 @@ public class IdcServiceImpl implements IdcService { /*解析到数据库*/ private boolean analyToDB(JSONObject jsonObject,MultipartFile[] files) { if(jsonObject.getJSONObject("data")!=null) { + String tableName = ""; + String uniqueColumn = ""; JSONObject object = jsonObject.getJSONObject("data"); List> list = new ArrayList<>(); if(object instanceof List) { list = jsonObject.getObject("data", List.class); + tableName = jsonObject.getString("tableName"); + uniqueColumn = jsonObject.getString("uniqueColumn"); } else { list = object.getObject("data", List.class); - + tableName = object.getString("tableName"); + uniqueColumn = object.getString("uniqueColumn"); } - if(!StringUtils.isEmpty(object.getString("tableName"))) { - return analyData(object.getString("tableName"),object.getString("uniqueColumn"),list); + + if(!StringUtils.isEmpty(tableName)) { + return analyData(tableName,uniqueColumn,list); } else { logger.error("数据格式错误：无数据标记"); }