From d2a998728b89362dfb4cbe35ace3a2c3da31e110 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Tue, 18 Dec 2018 16:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7UI=E8=AE=BE=E7=BD=AE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/UISettingsController.java        | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
index ca33646..b89c6b5 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
@@ -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);
 	}