windy/admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

当没有参数时 才返回默认UI设置数据

Browse Source
This commit is contained in:
fanghongchao
2018-12-19 16:13:43 +08:00
parent f85f351ef0
commit 71716f7fbc
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+24 -21
View File
@@ -89,38 +89,41 @@ public class UISettingsController {
@RequestParam(required=false) String groupCode) @RequestParam(required=false) String groupCode)
{ {
List<Uisettings> uisettingsList = new ArrayList<Uisettings>(); List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
//将默认的ui设置放入内存 Map<String, UisettingsDto> defualtUiSettingsMap = null;
List<UisettingsDefault> uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll(); //条件应该为并列
Map<String, UisettingsDto> defualtUiSettingsMap = new HashMap<String, UisettingsDto>(); if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){ //双条件都存在
if(null!=uisettingsDefaultList && uisettingsDefaultList.size()>0){
for(UisettingsDefault uisettingsDefault:uisettingsDefaultList){
defualtUiSettingsMap.put(uisettingsDefault.getGroupCode(), uisettingsConvert.uisettingsDefaultToUisettingsDto(uisettingsDefault));
}
}
if(!StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)){
//包括envCode、groupCode条件 //包括envCode、groupCode条件
uisettingsList = uisettingsDao.findByEnvCodeAndGroupCodeAndUserid(envCode,groupCode,userService.getCurrentUserId()); uisettingsList = uisettingsDao.findByEnvCodeAndGroupCodeAndUserid(envCode,groupCode,userService.getCurrentUserId());
}else if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){ }
if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){//双条件都为空
uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId()); uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId());
}else{ //条件都为空时 提供默认UI设置
if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) { //将默认的ui设置放入内存
//envCode条件s List<UisettingsDefault> uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId()); defualtUiSettingsMap = new HashMap<String, UisettingsDto>();
} if(null!=uisettingsDefaultList && uisettingsDefaultList.size()>0){
if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) { for(UisettingsDefault uisettingsDefault:uisettingsDefaultList){
//groupCode条件 defualtUiSettingsMap.put(uisettingsDefault.getGroupCode(), uisettingsConvert.uisettingsDefaultToUisettingsDto(uisettingsDefault));
uisettingsList = uisettingsDao.findByGroupCodeAndUserid(groupCode,userService.getCurrentUserId()); }
} }
} }
if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) { //envCode非空 groupCode空
//envCode条件
uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId());
}
if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) { //envCode空 groupCode非空
//groupCode条件
uisettingsList = uisettingsDao.findByGroupCodeAndUserid(groupCode,userService.getCurrentUserId());
}
//转换dto //转换dto
List<UisettingsDto> uisettingsListDto = new ArrayList<UisettingsDto>(); List<UisettingsDto> uisettingsListDto = new ArrayList<UisettingsDto>();
if(null!=uisettingsList && uisettingsList.size()>0){ if(null!=uisettingsList && uisettingsList.size()>0){
for(Uisettings u:uisettingsList){ for(Uisettings u:uisettingsList){
uisettingsListDto.add(uisettingsConvert.uisettingsToUisettingsDto(u)); uisettingsListDto.add(uisettingsConvert.uisettingsToUisettingsDto(u));
defualtUiSettingsMap.remove(u.getGroupCode()); if(null!=defualtUiSettingsMap && defualtUiSettingsMap.size()>0){
defualtUiSettingsMap.remove(u.getGroupCode());
}
} }
} }