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 result = new ArrayList<>(); if (name.equals(APP_CODE)) { - List codeDicList = (List) 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 codeDicList = (List) CacheUtils.get(APP_CODE); + List 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 codeDicList = (List) 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 codeDicList = (List) CacheUtils.get(BEHAVIOR_CODE); +// if(StringUtil.isEmpty(codeDicList)){ +// codeDicList = codeBehaviorTypeDicDao.getCodeDicList(); +// CacheUtils.put(BEHAVIOR_CODE,codeDicList); +// } + List 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 codeDicList = (List) 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 codeDicList = (List) CacheUtils.get(BROWSER_CODE); +// if(StringUtil.isEmpty(codeDicList)){ +// codeDicList = codeBrowserTypeDicDao.getCodeDicList(); +// CacheUtils.put(BROWSER_CODE, codeDicList); +// } + List 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 codeDicList = (List) 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 codeDicList = (List) CacheUtils.get(OS_CODE); +// if(StringUtil.isEmpty(codeDicList)){ +// codeDicList = codeOsTypeDicDao.getCodeDicList(); +// CacheUtils.put(OS_CODE, codeDicList); +// } + List 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 codeDicList = (List) 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 codeDicList = (List) CacheUtils.get(PROTOCOL_CODE); +// if(StringUtil.isEmpty(codeDicList)){ +// codeDicList = codeProtocolTypeDicDao.getCodeDicList(); +// CacheUtils.put(PROTOCOL_CODE, codeDicList); +// } + List 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 codeDicList = (List) 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 codeDicList = (List) CacheUtils.get(SERVICE_CODE); +// if(StringUtil.isEmpty(codeDicList)){ +// codeDicList = codeServiceTypeDicDao.getCodeDicList(); +// CacheUtils.put(SERVICE_CODE, codeDicList); +// } + List 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 codeDicList = (List) 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 codeDicList = (List) CacheUtils.get(WEB_CODE); +// if(StringUtil.isEmpty(codeDicList)){ +// codeDicList = codeWebServiceDicDao.getCodeDicList(); +// CacheUtils.put(WEB_CODE, codeDicList); +// } + List 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; }