|
@@ -31,10 +31,10 @@ public class CrisisApplication {
|
|
|
|
|
|
Map<String, List<CrisisDetail>> crisisMap = new HashMap<>();
|
|
|
List<CrisisDetail> crisisList = null;
|
|
|
- if (StringUtils.isEmpty(searchData.getRuleTypeId())) {
|
|
|
- ruleTypeIdList = getallRuleId(ruleApps);
|
|
|
+ if (StringUtils.isEmpty(searchData.getFeatureType())) {
|
|
|
+ ruleTypeIdList = getAllRuleId(ruleApps);
|
|
|
} else {
|
|
|
- ruleTypeIdList = Arrays.asList(searchData.getRuleTypeId().split(","));
|
|
|
+ ruleTypeIdList = Arrays.asList(searchData.getFeatureType().split(","));
|
|
|
}
|
|
|
for (Map.Entry<String, RuleApp> app : ruleApps.entrySet()) {
|
|
|
if (StringUtils.isEmpty(app.getValue().getRuleIds()) || StringUtils.isEmpty(app.getValue().getTypeId())) {
|
|
@@ -90,7 +90,7 @@ public class CrisisApplication {
|
|
|
return crisisMap;
|
|
|
}
|
|
|
|
|
|
- private List<String> getallRuleId(Map<String, RuleApp> ruleApps) {
|
|
|
+ private List<String> getAllRuleId(Map<String, RuleApp> ruleApps) {
|
|
|
Set<String> typeIdSet = new HashSet<>();
|
|
|
for (Map.Entry<String, RuleApp> ruleAppEntry : ruleApps.entrySet()) {
|
|
|
typeIdSet.add(ruleAppEntry.getValue().getTypeId());
|