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

当传值groupCode时，找不到用户UI设置，这使用默认设置

Browse Source
This commit is contained in:
fanghongchao
2018-12-19 16:32:47 +08:00
parent 71716f7fbc
commit 8a3a73b4f7
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class HistoryFlightDataController {
hitEndTime = DateUtils.swichTimeToEn_ddMMMyyHHmm(hstFLightTime +" 23:59:59");
}
//历史创建使劲
//计划时间
boolQuery.must(QueryBuilders.rangeQuery("SODT")
.gte(hitStartTime).lte(hitEndTime));
src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+15 -10
View File
@@ -89,7 +89,15 @@ public class UISettingsController {
@RequestParam(required=false) String groupCode)
{
List<Uisettings> uisettingsList = new ArrayList<Uisettings>();
Map<String, UisettingsDto> defualtUiSettingsMap = null;
//将默认的ui设置放入内存
Map<String, UisettingsDto> defualtUiSettingsMap = new HashMap<String, UisettingsDto>();
List<UisettingsDefault> uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
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条件
@@ -98,14 +106,6 @@ public class UISettingsController {
if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){//双条件都为空
uisettingsList = uisettingsDao.findByUserid(userService.getCurrentUserId());
//条件都为空时 提供默认UI设置
//将默认的ui设置放入内存
List<UisettingsDefault> uisettingsDefaultList = (List<UisettingsDefault>) uisettingsDefaultDao.findAll();
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空
//envCode条件
@@ -128,7 +128,12 @@ public class UISettingsController {
}
if(null!=defualtUiSettingsMap && defualtUiSettingsMap.size()>0){
uisettingsListDto.addAll(defualtUiSettingsMap.values());
if(StringUtils.isEmpty(envCode) && StringUtils.isEmpty(groupCode)){//双条件都为空
uisettingsListDto.addAll(defualtUiSettingsMap.values());
}
if(!StringUtils.isEmpty(groupCode)){//groupCode 存在时
uisettingsListDto.add(defualtUiSettingsMap.get(groupCode));
}
}
return ResponseDto.success(uisettingsListDto);