|
@ -95,12 +95,16 @@ public class DataSyncJob { |
|
|
endTime = DATE_FORMAT_WITH_TIME.format(date); |
|
|
endTime = DATE_FORMAT_WITH_TIME.format(date); |
|
|
} |
|
|
} |
|
|
do { |
|
|
do { |
|
|
String requestUrl = String.format("%s%s?pageNum=%s&pageSize=%s", dataSyncUrl, url, pageNum, pageSize); |
|
|
String requestUrl = String.format("%s%s", dataSyncUrl, url); |
|
|
if (StringUtils.isNotBlank(type)) { |
|
|
// 发送POST请求
|
|
|
requestUrl = String.format("%s&START_TIME=%s&END_TIME=%s", requestUrl, beginTime, endTime); |
|
|
Map<String, Object> map = new HashMap(); |
|
|
|
|
|
map.put("pageNum", pageNum); |
|
|
|
|
|
map.put("pageSize", pageSize); |
|
|
|
|
|
if(StringUtils.isNotBlank(type)){ |
|
|
|
|
|
map.put("beginTime", beginTime); |
|
|
|
|
|
map.put("endTime", endTime); |
|
|
} |
|
|
} |
|
|
// 发送请求
|
|
|
String jsonStr = restTemplateUtils.doPostRequest(requestUrl, map); |
|
|
String jsonStr = restTemplateUtils.doGetRequest(requestUrl); |
|
|
|
|
|
if (StringUtils.isBlank(jsonStr)) { |
|
|
if (StringUtils.isBlank(jsonStr)) { |
|
|
log.info(String.format("--------数据同步请求%s出错,响应结果为空--------", remark)); |
|
|
log.info(String.format("--------数据同步请求%s出错,响应结果为空--------", remark)); |
|
|
break; |
|
|
break; |
|
@ -160,7 +164,7 @@ public class DataSyncJob { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
return extractValue(obj, fieldName, fieldType, nowDate); |
|
|
return extractValue(obj, fieldName, fieldType, nowDate); |
|
|
}).filter(Objects::nonNull).collect(Collectors.toList())) |
|
|
}).collect(Collectors.toList())) |
|
|
.collect(Collectors.toList()); |
|
|
.collect(Collectors.toList()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@ -231,7 +235,7 @@ public class DataSyncJob { |
|
|
try { |
|
|
try { |
|
|
return StringUtils.isNotBlank(obj.getString(fieldName)) ? new BigDecimal(obj.getString(fieldName)) : new BigDecimal(0); |
|
|
return StringUtils.isNotBlank(obj.getString(fieldName)) ? new BigDecimal(obj.getString(fieldName)) : new BigDecimal(0); |
|
|
} catch (NumberFormatException e) { |
|
|
} catch (NumberFormatException e) { |
|
|
log.error("Failed to convert field {} to BigDecimal", fieldName, e); |
|
|
// log.error("Failed to convert field {} to BigDecimal", fieldName, e);
|
|
|
return new BigDecimal(0); |
|
|
return new BigDecimal(0); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -244,7 +248,7 @@ public class DataSyncJob { |
|
|
try { |
|
|
try { |
|
|
return DATE_FORMAT_WITH_OUT_TIME.parse(dateStr); |
|
|
return DATE_FORMAT_WITH_OUT_TIME.parse(dateStr); |
|
|
} catch (ParseException ex) { |
|
|
} catch (ParseException ex) { |
|
|
log.error("Failed to convert field {} to Date", fieldName, ex); |
|
|
// log.error("Failed to convert field {} to Date", fieldName, ex);
|
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|