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-18 16:24:53 +08:00
parent 26e5ed3eba
commit d2a998728b
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+15 -17
View File
@@ -6,8 +6,10 @@ import io.swagger.annotations.ApiOperation;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,32 +89,29 @@ public class UISettingsController {
@RequestParam(required=false) String groupCode)
{
List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
List<UisettingsDefault> uisettingsDefaultList = new ArrayList<UisettingsDefault>();
//将默认的ui设置放入内存
List<UisettingsDefault> uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
Map<String, UisettingsDto> defualtUiSettingsMap = new HashMap<String, UisettingsDto>();
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条件
uisettingsList = uisettingsDao.findByEnvCodeAndGroupCodeAndUserid(envCode,groupCode,userService.getCurrentUserId());
if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
uisettingsDefaultList = uisettingsDefaultDao.findByEnvCodeAndGroupCode(envCode,groupCode);
}
}else if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){
uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId());
if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
}
}else{
if (!StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)) {
//envCode条件s
uisettingsList = uisettingsDao.findByEnvCodeAndUserid(envCode,userService.getCurrentUserId());
if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
uisettingsDefaultList = uisettingsDefaultDao.findByEnvCode(envCode);
}
}
if (StringUtils.isEmpty(envCode) && !StringUtils.isEmpty(groupCode)) {
//groupCode条件
uisettingsList = uisettingsDao.findByGroupCodeAndUserid(groupCode,userService.getCurrentUserId());
if(null==uisettingsList || uisettingsList.size()<=0){ //用户未设置则查找默认的设置
uisettingsDefaultList = uisettingsDefaultDao.findByGroupCode(groupCode);
}
}
}
@@ -121,12 +120,11 @@ public class UISettingsController {
if(null!=uisettingsList && uisettingsList.size()>0){
for(Uisettings u:uisettingsList){
uisettingsListDto.add(uisettingsConvert.uisettingsToUisettingsDto(u));
defualtUiSettingsMap.remove(u.getGroupCode());
}
}
if(null!=uisettingsDefaultList && uisettingsDefaultList.size()>0){
for(UisettingsDefault ud:uisettingsDefaultList){
uisettingsListDto.add(uisettingsConvert.uisettingsDefaultToUisettingsDto(ud));
}
for(String key : defualtUiSettingsMap.keySet()){
uisettingsListDto.add(defualtUiSettingsMap.get(key));
}
return ResponseDto.success(uisettingsListDto);
}