kris/data-dump
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix】 修复更新关联类型和存量文件对象

Browse Source 
(cherry picked from commit f7572ad7ac)
This commit is contained in:
Kris 2025-07-30 11:04:48 +08:00
parent f9fc4f2d59
commit dcbe71cffd
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/celnet/datadump/service/impl/CommonServiceImpl.java
View File

@ -853,6 +853,26 @@ public class CommonServiceImpl implements CommonService {
List<Map<String, Object>> maps = Lists.newArrayList(); List<Map<String, Object>> maps = Lists.newArrayList();
for (String key : keys) { for (String key : keys) {
if (fields.stream().anyMatch(key::equalsIgnoreCase)) { 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<String, Object> 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<String, Object> paramMap = Maps.newHashMap();
paramMap.put("key", "Name");
paramMap.put("value", name);
maps.add(paramMap);
continue;
}
Map<String, Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("key", key); paramMap.put("key", key);
paramMap.put("value", jsonObject.get(key)); paramMap.put("value", jsonObject.get(key));
@ -872,23 +892,7 @@ public class CommonServiceImpl implements CommonService {
maps.add(paramMap2); maps.add(paramMap2);
} }
// ContentVersion表，插入更新时把title中的/替换为-
if ("ContentVersion".equals(one.getName())){
String title = StringUtils.replace(String.valueOf(jsonObject.get("Title")), "/", "-");
Map<String, Object> 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<String, Object> paramMap = Maps.newHashMap();
paramMap.put("key", "Name");
paramMap.put("value", name);
maps.add(paramMap);
}
if (existsIds.contains(id)) { if (existsIds.contains(id)) {
customMapper.updateById(api, maps, id); customMapper.updateById(api, maps, id);

2
src/main/java/com/celnet/datadump/service/impl/DataImportNewServiceImpl.java
View File

@ -1863,7 +1863,7 @@ public class DataImportNewServiceImpl implements DataImportNewService {
String sql1 = null; String sql1 = null;
String sql2 = null; String sql2 = null;
if (beginDateStr != null){ if (beginDateStr != null){
sql1 = "where SystemModstamp >= '" + beginDateStr; sql1 = "where SystemModstamp >= " + beginDateStr;
sql2 = "SystemModstamp >= "+ beginDateStr +" order by Id limit " ; sql2 = "SystemModstamp >= "+ beginDateStr +" order by Id limit " ;
}else { }else {
sql1 = null; sql1 = null;