|
|
|
@ -29,6 +29,7 @@ import java.time.*; |
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
import java.time.temporal.ChronoUnit; |
|
|
|
import java.time.temporal.ChronoUnit; |
|
|
|
import java.util.*; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
import java.util.function.Function; |
|
|
|
import java.util.regex.Matcher; |
|
|
|
import java.util.regex.Matcher; |
|
|
|
import java.util.regex.Pattern; |
|
|
|
import java.util.regex.Pattern; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
@ -406,7 +407,17 @@ public class ModelClueServiceImpl implements ModelClueService { |
|
|
|
if (needsInsertIds.isEmpty()) { |
|
|
|
if (needsInsertIds.isEmpty()) { |
|
|
|
return new ArrayList<>(); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
} |
|
|
|
return modelClues.stream().filter(item -> needsInsertIds.contains(item.getUniqueKey())).toList(); |
|
|
|
// return modelClues.stream().filter(item -> needsInsertIds.contains(item.getUniqueKey())).toList();
|
|
|
|
|
|
|
|
return modelClues.stream() |
|
|
|
|
|
|
|
.filter(item -> needsInsertIds.contains(item.getUniqueKey())) |
|
|
|
|
|
|
|
.collect(Collectors.toMap( |
|
|
|
|
|
|
|
ModelClue::getUniqueKey, |
|
|
|
|
|
|
|
Function.identity(), |
|
|
|
|
|
|
|
(existing, replacement) -> existing |
|
|
|
|
|
|
|
)) |
|
|
|
|
|
|
|
.values() |
|
|
|
|
|
|
|
.stream() |
|
|
|
|
|
|
|
.toList(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void getModelCluesForModel7(String param, List<ModelClue> modelClues) { |
|
|
|
private void getModelCluesForModel7(String param, List<ModelClue> modelClues) { |
|
|
|
|