|
|
|
@ -713,7 +713,7 @@ public class IdcServiceImpl implements IdcService {
|
|
|
|
|
if(isToDB) {
|
|
|
|
|
return analyToDB(host,tableName,uniqueColumn,filePathColumn,list,isUpload);
|
|
|
|
|
} else {
|
|
|
|
|
logger.info("files-->"+tableName);
|
|
|
|
|
//logger.info("files-->"+tableName);
|
|
|
|
|
return analyToFile(host,filePathColumn,list);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
@ -728,11 +728,11 @@ public class IdcServiceImpl implements IdcService {
|
|
|
|
|
|
|
|
|
|
if(list!=null&&list.size()>0) {
|
|
|
|
|
String[] files = new String[list.size()];
|
|
|
|
|
logger.info("filePathColumn-->"+filePathColumn);
|
|
|
|
|
//logger.info("filePathColumn-->"+filePathColumn);
|
|
|
|
|
for(int i=0;i<list.size();i++) {
|
|
|
|
|
if(!StringUtils.isEmpty(filePathColumn)) {
|
|
|
|
|
files[i] = list.get(i).get(filePathColumn) !=null ? list.get(i).get(filePathColumn).toString() : "";
|
|
|
|
|
logger.info("file-->"+files[i]);
|
|
|
|
|
//logger.info("file-->"+files[i]);
|
|
|
|
|
}
|
|
|
|
|
for(int z=0;z<30;z++) {
|
|
|
|
|
if(list.get(i).get("data"+z)!=null) {
|
|
|
|
@ -873,8 +873,7 @@ public class IdcServiceImpl implements IdcService {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
if(n>0) {
|
|
|
|
|
if(tableName.equals("basic_products"))
|
|
|
|
|
logger.info("sql-->"+sql);
|
|
|
|
|
|
|
|
|
|
result = (dbDao.save(sql)>0);
|
|
|
|
|
if(!result)
|
|
|
|
|
logger.error(tableName+"-->fetchSave Fail");
|
|
|
|
@ -948,7 +947,7 @@ public class IdcServiceImpl implements IdcService {
|
|
|
|
|
String[] str = fileName.split(",");
|
|
|
|
|
for(int i=0;i<str.length;i++) {
|
|
|
|
|
if(!StringUtils.isEmpty(str[i])) {
|
|
|
|
|
logger.info("downloadFile-->"+str[i]);
|
|
|
|
|
|
|
|
|
|
if(!signleDownloadFile(syncIp,str[i]))
|
|
|
|
|
success = false;
|
|
|
|
|
}
|
|
|
|
@ -1034,8 +1033,7 @@ public class IdcServiceImpl implements IdcService {
|
|
|
|
|
|
|
|
|
|
String where = DBAUtils.convertWhere(column,params,"");
|
|
|
|
|
sql+=!StringUtils.isEmpty(where) ? " where "+where : "";
|
|
|
|
|
if(tableName.equals("basic_products"))
|
|
|
|
|
logger.info("where-->"+where);
|
|
|
|
|
|
|
|
|
|
Map<String,Object> map = new HashMap<String,Object>();
|
|
|
|
|
map.putAll(params);
|
|
|
|
|
map.put("sql", sql);
|
|
|
|
|