|
@ -208,14 +208,6 @@ public class ElasticSearchDataProcessService {
|
|
objChildMap = extendDictData(objChildMap,cloumnCode,dict,cloumnValue);
|
|
objChildMap = extendDictData(objChildMap,cloumnCode,dict,cloumnValue);
|
|
source.put(parentCode,objChildMap);
|
|
source.put(parentCode,objChildMap);
|
|
}else if(StringUtils.isNotEmpty(algorithm)){
|
|
}else if(StringUtils.isNotEmpty(algorithm)){
|
|
//年龄段
|
|
|
|
if(algorithm.equals("AgeGroupFunc")){
|
|
|
|
objChildMap = extendAgeGroupData(objChildMap,cloumnCode,dict,cloumnValue);
|
|
|
|
}
|
|
|
|
//区域算法
|
|
|
|
if(algorithm.equals("DivisionFunc") && StringUtils.isNotEmpty(algorithmParm)){
|
|
|
|
objChildMap = extendDivisionData(objChildMap, cloumnCode, algorithmParm, cloumnValue);
|
|
|
|
}
|
|
|
|
source.put(parentCode,objChildMap);
|
|
source.put(parentCode,objChildMap);
|
|
//其他算法 --
|
|
//其他算法 --
|
|
}
|
|
}
|
|
@ -233,6 +225,11 @@ public class ElasticSearchDataProcessService {
|
|
if(subRowKey.equals(map.get(subRowKey_k).toString())){
|
|
if(subRowKey.equals(map.get(subRowKey_k).toString())){
|
|
map.put(subRowKey_k,subRowKey);
|
|
map.put(subRowKey_k,subRowKey);
|
|
map.put(cloumnCode,dataConver(dataType,cloumnValue));
|
|
map.put(cloumnCode,dataConver(dataType,cloumnValue));
|
|
|
|
if(StringUtils.isNotEmpty(dict)){
|
|
|
|
map = extendDictData(map,cloumnCode,dict,cloumnValue);
|
|
|
|
}else if(StringUtils.isNotEmpty(algorithm)){
|
|
|
|
//其他算法
|
|
|
|
}
|
|
isexist = true;
|
|
isexist = true;
|
|
}
|
|
}
|
|
nestedList.add(map);
|
|
nestedList.add(map);
|
|
@ -241,6 +238,11 @@ public class ElasticSearchDataProcessService {
|
|
Map<String,Object> map = new HashMap<>();
|
|
Map<String,Object> map = new HashMap<>();
|
|
map.put(subRowKey_k,subRowKey);
|
|
map.put(subRowKey_k,subRowKey);
|
|
map.put(cloumnCode,dataConver(dataType,cloumnValue));
|
|
map.put(cloumnCode,dataConver(dataType,cloumnValue));
|
|
|
|
if(StringUtils.isNotEmpty(dict)){
|
|
|
|
map = extendDictData(map,cloumnCode,dict,cloumnValue);
|
|
|
|
}else if(StringUtils.isNotEmpty(algorithm)){
|
|
|
|
//其他算法
|
|
|
|
}
|
|
nestedList.add(map);
|
|
nestedList.add(map);
|
|
}
|
|
}
|
|
source.put(parentCode, nestedList);
|
|
source.put(parentCode, nestedList);
|