xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改代码兼容Oracle和Pgsql

Browse Source
This commit is contained in:
duwenyuan 2026-05-21 10:12:18 +08:00
parent 3ec5dfd113
commit 0d4df398f0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/GardsSampleDataServiceImpl.java
View File

@ -123,10 +123,11 @@ public class GardsSampleDataServiceImpl
String ORIGINAL = "ORIGINAL"; String ORIGINAL = "ORIGINAL";
String RNAUTO = "RNAUTO"; String RNAUTO = "RNAUTO";
String RNMAN = "RNMAN"; String RNMAN = "RNMAN";
List<String> suitable = ListUtil.toList(ORIGINAL, RNAUTO, RNMAN); Set<String> suitableSet = new HashSet<>(Arrays.asList(ORIGINAL, RNAUTO, RNMAN));
List<OwnerDto> ownerDtos = baseMapper.containSampleId("SAMPLE_ID").stream() List<OwnerDto> ownerDtos = baseMapper.containSampleId("SAMPLE_ID").stream()
.filter(owner -> CollUtil.contains(suitable, owner.getOwner())) .filter(owner -> Objects.nonNull(owner.getOwner()))
.filter(owner -> StrUtil.contains(owner.getTableName(), "GARDS")) .filter(owner ->suitableSet.contains(owner.getOwner().toUpperCase()))
.filter(owner -> StrUtil.contains(owner.getTableName().toUpperCase(), "GARDS"))
.collect(Collectors.toList()); .collect(Collectors.toList());
String DOT = StrUtil.DOT; String DOT = StrUtil.DOT;
@ -149,7 +150,7 @@ public class GardsSampleDataServiceImpl
if (rnAuto) { if (rnAuto) {
// 收集自动处理库所有表名 // 收集自动处理库所有表名
List<String> autoTables = ownerDtos.stream() List<String> autoTables = ownerDtos.stream()
.filter(owner -> StrUtil.equals(owner.getOwner(), RNAUTO)) .filter(owner -> StrUtil.equals(owner.getOwner().toUpperCase(), RNAUTO))
.map(owner -> owner.getOwner() + DOT + owner.getTableName()) .map(owner -> owner.getOwner() + DOT + owner.getTableName())
.collect(Collectors.toList()); .collect(Collectors.toList());
// 收集待删除文件路径 // 收集待删除文件路径
@ -163,7 +164,7 @@ public class GardsSampleDataServiceImpl
if (rnMan) { if (rnMan) {
// 收集人工交互库所有表名 // 收集人工交互库所有表名
List<String> manTables = ownerDtos.stream() List<String> manTables = ownerDtos.stream()
.filter(owner -> StrUtil.equals(owner.getOwner(), RNMAN)) .filter(owner -> StrUtil.equals(owner.getOwner().toUpperCase(), RNMAN))
.map(owner -> owner.getOwner() + DOT + owner.getTableName()) .map(owner -> owner.getOwner() + DOT + owner.getTableName())
.collect(Collectors.toList()); .collect(Collectors.toList());
// 收集待删除文件路径 // 收集待删除文件路径