|
@@ -15,10 +15,7 @@ import javax.annotation.Resource;
|
|
import javax.validation.constraints.NotNull;
|
|
import javax.validation.constraints.NotNull;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
-import java.util.Comparator;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
import java.util.function.Function;
|
|
import java.util.function.Function;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -79,9 +76,8 @@ public class ConfigService extends ServiceImpl<ConfigItemDao, ConfigItem> {
|
|
item.setMode(base.getMode());
|
|
item.setMode(base.getMode());
|
|
item.setComment(base.getComment());
|
|
item.setComment(base.getComment());
|
|
}
|
|
}
|
|
- configItemDao.insert(item);
|
|
|
|
}
|
|
}
|
|
- //saveBatch(list);
|
|
|
|
|
|
+ saveBatch(list);
|
|
List<ConfigItem> baseline = listBaseline(app.getId(), version.getId(), module.getId());
|
|
List<ConfigItem> baseline = listBaseline(app.getId(), version.getId(), module.getId());
|
|
baseMap.clear();
|
|
baseMap.clear();
|
|
baseline.forEach(item -> baseMap.put(item.getKey(), item));
|
|
baseline.forEach(item -> baseMap.put(item.getKey(), item));
|
|
@@ -111,17 +107,16 @@ public class ConfigService extends ServiceImpl<ConfigItemDao, ConfigItem> {
|
|
long time = System.currentTimeMillis();
|
|
long time = System.currentTimeMillis();
|
|
List<ConfigItem> inheritList = listConfigItem(app.getId(), inheritVersion.getId(), module.getId(),
|
|
List<ConfigItem> inheritList = listConfigItem(app.getId(), inheritVersion.getId(), module.getId(),
|
|
env.getId());
|
|
env.getId());
|
|
- //List<ConfigItem> saveList = new LinkedList<>();
|
|
|
|
|
|
+ List<ConfigItem> saveList = new LinkedList<>();
|
|
for (ConfigItem item : inheritList) {
|
|
for (ConfigItem item : inheritList) {
|
|
if (accept(item, baseMap)) {
|
|
if (accept(item, baseMap)) {
|
|
item.setVersionId(version.getId());
|
|
item.setVersionId(version.getId());
|
|
item.setCreateTime(time);
|
|
item.setCreateTime(time);
|
|
item.setUpdateTime(time);
|
|
item.setUpdateTime(time);
|
|
- configItemDao.insert(item);
|
|
|
|
- //saveList.add(item);
|
|
|
|
|
|
+ saveList.add(item);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- //saveBatch(saveList);
|
|
|
|
|
|
+ saveBatch(saveList);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|