master
admin 2 years ago
parent 684a431bc5
commit 19fff9038b

@ -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<Map<String,Object>> list = jsonObject.getObject("data", List.class);
JSONObject object = jsonObject.getJSONObject("data");
List<Map<String,Object>> 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);
//图片处理
}

Loading…
Cancel
Save