From 30e2cc0805719955a3739bd2e51654c92df4f4d4 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Sun, 19 Aug 2018 10:47:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A0=81=E8=A1=A8=E6=A0=87=E7=AD=BE=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=96=EF=BC=8C=E6=B3=A8=E9=87=8A=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/CodeDicUtils.java | 175 +++++++++++--------
 1 file changed, 98 insertions(+), 77 deletions(-)

diff --git a/src/main/java/com/nis/util/CodeDicUtils.java b/src/main/java/com/nis/util/CodeDicUtils.java
index 580042d61..693a54908 100644
--- a/src/main/java/com/nis/util/CodeDicUtils.java
+++ b/src/main/java/com/nis/util/CodeDicUtils.java
@@ -54,102 +54,123 @@ public class CodeDicUtils {
 		
 		List<CodeResult> result = new ArrayList<>();
 		if (name.equals(APP_CODE)) {
-			List<CodeAppDic> codeDicList = (List<CodeAppDic>) CacheUtils.get(APP_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeAppDicDao.getCodeDicList();
-				CacheUtils.put(APP_CODE,codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getAppName());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				codeResult.setCoreApp(codeDicList.get(i).getCoreApp());
-				result.add(codeResult);
+//			List<CodeAppDic> codeDicList = (List<CodeAppDic>) CacheUtils.get(APP_CODE);
+			List<CodeAppDic> codeDicList = codeAppDicDao.getCodeDicList();
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeAppDicDao.getCodeDicList();
+//				CacheUtils.put(APP_CODE,codeDicList);
+//			}
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getAppName());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					codeResult.setCoreApp(codeDicList.get(i).getCoreApp());
+					result.add(codeResult);
+				}
 			}
 			return result;
 
 		} else if (name.equals(BEHAVIOR_CODE)) {
-			List<CodeBehaviorTypeDic> codeDicList = (List<CodeBehaviorTypeDic>) CacheUtils.get(BEHAVIOR_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-			codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
-			CacheUtils.put(BEHAVIOR_CODE,codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getBehaviorType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeBehaviorTypeDic> codeDicList = (List<CodeBehaviorTypeDic>) CacheUtils.get(BEHAVIOR_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//			codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
+//			CacheUtils.put(BEHAVIOR_CODE,codeDicList);
+//			}
+			List<CodeBehaviorTypeDic> codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getBehaviorType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(BROWSER_CODE)) {
-			List<CodeBrowserTypeDic> codeDicList = (List<CodeBrowserTypeDic>) CacheUtils.get(BROWSER_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeBrowserTypeDicDao.getCodeDicList();
-				CacheUtils.put(BROWSER_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getBrowserType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeBrowserTypeDic> codeDicList = (List<CodeBrowserTypeDic>) CacheUtils.get(BROWSER_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeBrowserTypeDicDao.getCodeDicList();
+//				CacheUtils.put(BROWSER_CODE, codeDicList);
+//			}
+			List<CodeBrowserTypeDic> codeDicList = codeBrowserTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getBrowserType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(OS_CODE)) {
-			List<CodeOsTypeDic> codeDicList = (List<CodeOsTypeDic>) CacheUtils.get(OS_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeOsTypeDicDao.getCodeDicList();
-				CacheUtils.put(OS_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getOsType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeOsTypeDic> codeDicList = (List<CodeOsTypeDic>) CacheUtils.get(OS_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeOsTypeDicDao.getCodeDicList();
+//				CacheUtils.put(OS_CODE, codeDicList);
+//			}
+			List<CodeOsTypeDic> codeDicList = codeOsTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getOsType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(PROTOCOL_CODE)) {
-			List<CodeProtocolTypeDic> codeDicList = (List<CodeProtocolTypeDic>) CacheUtils.get(PROTOCOL_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeProtocolTypeDicDao.getCodeDicList();
-				CacheUtils.put(PROTOCOL_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getProtocolType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeProtocolTypeDic> codeDicList = (List<CodeProtocolTypeDic>) CacheUtils.get(PROTOCOL_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeProtocolTypeDicDao.getCodeDicList();
+//				CacheUtils.put(PROTOCOL_CODE, codeDicList);
+//			}
+			List<CodeProtocolTypeDic> codeDicList = codeProtocolTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getProtocolType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(SERVICE_CODE)) {
-			List<CodeServiceTypeDic> codeDicList = (List<CodeServiceTypeDic>) CacheUtils.get(SERVICE_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeServiceTypeDicDao.getCodeDicList();
-				CacheUtils.put(SERVICE_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getServiceType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeServiceTypeDic> codeDicList = (List<CodeServiceTypeDic>) CacheUtils.get(SERVICE_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeServiceTypeDicDao.getCodeDicList();
+//				CacheUtils.put(SERVICE_CODE, codeDicList);
+//			}
+			List<CodeServiceTypeDic> codeDicList = codeServiceTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getServiceType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(WEB_CODE)) {
-			List<CodeWebServiceDic> codeDicList = (List<CodeWebServiceDic>) CacheUtils.get(WEB_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeWebServiceDicDao.getCodeDicList();
-				CacheUtils.put(WEB_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getWebsite());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeWebServiceDic> codeDicList = (List<CodeWebServiceDic>) CacheUtils.get(WEB_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeWebServiceDicDao.getCodeDicList();
+//				CacheUtils.put(WEB_CODE, codeDicList);
+//			}
+			List<CodeWebServiceDic> codeDicList = codeWebServiceDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getWebsite());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		}