...
|
...
|
@@ -231,8 +231,10 @@ public class ChannelGroupServiceImpl implements ChannelGroupService { |
|
|
public Map<Integer,String> getCondition(String ids) {
|
|
|
logger.info("enter getCondition. param ids={}", ids);
|
|
|
List groupIds = Arrays.asList(ids.split(","));
|
|
|
//1.查询出所有分组的条件
|
|
|
List<ChannelGroupCondition> channelGroupConditions = channelGroupConditionDAO.selectByGroupIds(groupIds);
|
|
|
Map<Integer,Map<String,String>> conditionMap = Maps.newHashMap();
|
|
|
//2.将查询出的条件按照groupId进行合并
|
|
|
if(!CollectionUtils.isEmpty(channelGroupConditions)){
|
|
|
for(int i=0;i<channelGroupConditions.size();i++){
|
|
|
ChannelGroupCondition channelGroupCondition = channelGroupConditions.get(i);
|
...
|
...
|
@@ -247,7 +249,9 @@ public class ChannelGroupServiceImpl implements ChannelGroupService { |
|
|
}
|
|
|
}
|
|
|
}
|
|
|
logger.info("getCondition. conditionMap={}", conditionMap);
|
|
|
Map<Integer,String> result = Maps.newHashMap();
|
|
|
//3.将条件的key、value转为页面显示的名字
|
|
|
for (Map.Entry<Integer,Map<String,String>> entry : conditionMap .entrySet()) {
|
|
|
Map<String,String> map = entry.getValue();
|
|
|
StringBuffer sb = new StringBuffer();
|
...
|
...
|
|