|
@@ -13,6 +13,7 @@ import com.skyversation.poiaddr.util.lmrTools.initAddrMap;
|
|
|
import com.skyversation.poiaddr.util.tasks.ScheduledTasks;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
|
|
|
import javax.persistence.EntityManager;
|
|
|
import javax.persistence.PersistenceContext;
|
|
@@ -548,7 +549,7 @@ public class YyskAddressStandardizationServiceImpl {
|
|
|
datas.clear();
|
|
|
}
|
|
|
}
|
|
|
- if(datas.size() > 0){
|
|
|
+ if (datas.size() > 0) {
|
|
|
dataList.put("data", datas);
|
|
|
try {
|
|
|
System.out.println(AddressQueryEngine.getInstance().putDataToSJ_Big_Data2(dataList));
|
|
@@ -577,7 +578,7 @@ public class YyskAddressStandardizationServiceImpl {
|
|
|
Map<String, Object> item = fileData.get(i);
|
|
|
JSONObject data = new JSONObject();
|
|
|
for (String key : item.keySet()) {
|
|
|
- if (key.equals("updatetime")) {
|
|
|
+ if (key.equals("updatetime") && item.get(key) != null && StringUtils.hasText(item.get(key) + "")) {
|
|
|
String updateTimeStr = item.get(key).toString();
|
|
|
if (updateTimeStr.contains(".")) {
|
|
|
updateTimeStr = updateTimeStr.replaceAll("\\.", "").substring(0, 8);
|
|
@@ -591,7 +592,7 @@ public class YyskAddressStandardizationServiceImpl {
|
|
|
} else {
|
|
|
data.put(key, ScheduledTasks.timestampToFormat(item.get(key).toString()));
|
|
|
}
|
|
|
- } else if (key.equals("anchedate")) {
|
|
|
+ } else if (key.equals("anchedate") && item.get(key) != null && StringUtils.hasText(item.get(key) + "")) {
|
|
|
data.put(key, ScheduledTasks.timestampToFormat(item.get(key).toString()));
|
|
|
} else {
|
|
|
data.put(key, item.get(key));
|