diff --git a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java index 60d529f..da72e8c 100644 --- a/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java @@ -853,6 +853,26 @@ public class CommonServiceImpl implements CommonService { List> maps = Lists.newArrayList(); for (String key : keys) { if (fields.stream().anyMatch(key::equalsIgnoreCase)) { + // ContentVersion表,插入更新时把title中的/替换为- + if ("ContentVersion".equals(one.getName()) && "Title".equals(key)){ + String title = StringUtils.replace(String.valueOf(jsonObject.get("Title")), "/", "-"); + Map paramMap = Maps.newHashMap(); + paramMap.put("key", "Title"); + paramMap.put("value", title); + maps.add(paramMap); + continue; + } + + // Attachment,插入更新时把Name中的/替换为- + if ("Attachment".equals(one.getName()) && "Name".equals(key)){ + String name = StringUtils.replace(String.valueOf(jsonObject.get("Name")), "/", "-"); + Map paramMap = Maps.newHashMap(); + paramMap.put("key", "Name"); + paramMap.put("value", name); + maps.add(paramMap); + continue; + } + Map paramMap = Maps.newHashMap(); paramMap.put("key", key); paramMap.put("value", jsonObject.get(key)); @@ -872,23 +892,7 @@ public class CommonServiceImpl implements CommonService { maps.add(paramMap2); } - // ContentVersion表,插入更新时把title中的/替换为- - if ("ContentVersion".equals(one.getName())){ - String title = StringUtils.replace(String.valueOf(jsonObject.get("Title")), "/", "-"); - Map paramMap = Maps.newHashMap(); - paramMap.put("key", "Title"); - paramMap.put("value", title); - maps.add(paramMap); - } - // Attachment,插入更新时把Name中的/替换为- - if ("Attachment".equals(one.getName())){ - String name = StringUtils.replace(String.valueOf(jsonObject.get("Name")), "/", "-"); - Map paramMap = Maps.newHashMap(); - paramMap.put("key", "Name"); - paramMap.put("value", name); - maps.add(paramMap); - } if (existsIds.contains(id)) { customMapper.updateById(api, maps, id); diff --git a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java index da14bb2..89f399e 100644 --- a/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java +++ b/src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java @@ -1863,7 +1863,7 @@ public class DataImportNewServiceImpl implements DataImportNewService { String sql1 = null; String sql2 = null; if (beginDateStr != null){ - sql1 = "where SystemModstamp >= '" + beginDateStr; + sql1 = "where SystemModstamp >= " + beginDateStr; sql2 = "SystemModstamp >= "+ beginDateStr +" order by Id limit " ; }else { sql1 = null;