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 e1ce90e0d..35faac42d 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 @@ -543,7 +543,6 @@ public class IdcServiceImpl implements IdcService { if(!StringUtils.isEmpty(recordSql)) { dbDao.save("insert into idc_record (id,type,fkId,isEnd,createTime) values "+recordSql); } - saveDownloadStatus(messageType,json.getString("reqNo"),messageType+" 记录数:"+list.size()+"/"+total); saveIdcLog(messageType,"",tableName +">success",i *limit,total); } else { success = false; @@ -552,7 +551,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 +601,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("数据格式错误:无数据标记"); } @@ -620,6 +625,7 @@ public class IdcServiceImpl implements IdcService { return false; } + /*按表名解析数据到数据库,子表暂未处理*/ private boolean analyData(String tableName,String uniqueColumn,List> list) {