diff --git a/src/main/java/com/nis/domain/dashboard/codedic/CodeAppDic.java b/src/main/java/com/nis/domain/dashboard/codedic/CodeAppDic.java new file mode 100644 index 000000000..a20996933 --- /dev/null +++ b/src/main/java/com/nis/domain/dashboard/codedic/CodeAppDic.java @@ -0,0 +1,73 @@ +package com.nis.domain.dashboard.codedic; + +public class CodeAppDic { + private Integer id; + + private String appName; + + private String appNameZh; + + private String viewCode; + + private String icon; + + private String behavior; + + private Integer coreApp; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName == null ? null : appName.trim(); + } + + public String getAppNameZh() { + return appNameZh; + } + + public void setAppNameZh(String appNameZh) { + this.appNameZh = appNameZh == null ? null : appNameZh.trim(); + } + + public String getViewCode() { + return viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode == null ? null : viewCode.trim(); + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon == null ? null : icon.trim(); + } + + public String getBehavior() { + return behavior; + } + + public void setBehavior(String behavior) { + this.behavior = behavior == null ? null : behavior.trim(); + } + + public Integer getCoreApp() { + return coreApp; + } + + public void setCoreApp(Integer coreApp) { + this.coreApp = coreApp; + } +} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/dashboard/codedic/CodeBehaviorTypeDic.java b/src/main/java/com/nis/domain/dashboard/codedic/CodeBehaviorTypeDic.java new file mode 100644 index 000000000..a57814479 --- /dev/null +++ b/src/main/java/com/nis/domain/dashboard/codedic/CodeBehaviorTypeDic.java @@ -0,0 +1,33 @@ +package com.nis.domain.dashboard.codedic; + +public class CodeBehaviorTypeDic { + private Integer id; + + private String behaviorType; + + private String viewCode; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getBehaviorType() { + return behaviorType; + } + + public void setBehaviorType(String behaviorType) { + this.behaviorType = behaviorType == null ? null : behaviorType.trim(); + } + + public String getViewCode() { + return viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode == null ? null : viewCode.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/dashboard/codedic/CodeBrowserTypeDic.java b/src/main/java/com/nis/domain/dashboard/codedic/CodeBrowserTypeDic.java new file mode 100644 index 000000000..04c62dd8f --- /dev/null +++ b/src/main/java/com/nis/domain/dashboard/codedic/CodeBrowserTypeDic.java @@ -0,0 +1,43 @@ +package com.nis.domain.dashboard.codedic; + +public class CodeBrowserTypeDic { + private Integer id; + + private String browserType; + + private String viewCode; + + private String icon; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getBrowserType() { + return browserType; + } + + public void setBrowserType(String browserType) { + this.browserType = browserType == null ? null : browserType.trim(); + } + + public String getViewCode() { + return viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode == null ? null : viewCode.trim(); + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon == null ? null : icon.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/dashboard/codedic/CodeOsTypeDic.java b/src/main/java/com/nis/domain/dashboard/codedic/CodeOsTypeDic.java new file mode 100644 index 000000000..86d4c507b --- /dev/null +++ b/src/main/java/com/nis/domain/dashboard/codedic/CodeOsTypeDic.java @@ -0,0 +1,43 @@ +package com.nis.domain.dashboard.codedic; + +public class CodeOsTypeDic { + private Integer id; + + private String osType; + + private String viewCode; + + private String icon; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getOsType() { + return osType; + } + + public void setOsType(String osType) { + this.osType = osType == null ? null : osType.trim(); + } + + public String getViewCode() { + return viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode == null ? null : viewCode.trim(); + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon == null ? null : icon.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/dashboard/codedic/CodeProtocolTypeDic.java b/src/main/java/com/nis/domain/dashboard/codedic/CodeProtocolTypeDic.java new file mode 100644 index 000000000..a671ae85b --- /dev/null +++ b/src/main/java/com/nis/domain/dashboard/codedic/CodeProtocolTypeDic.java @@ -0,0 +1,33 @@ +package com.nis.domain.dashboard.codedic; + +public class CodeProtocolTypeDic { + private Integer id; + + private String protocolType; + + private String viewCode; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getProtocolType() { + return protocolType; + } + + public void setProtocolType(String protocolType) { + this.protocolType = protocolType == null ? null : protocolType.trim(); + } + + public String getViewCode() { + return viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode == null ? null : viewCode.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/dashboard/codedic/CodeServiceTypeDic.java b/src/main/java/com/nis/domain/dashboard/codedic/CodeServiceTypeDic.java new file mode 100644 index 000000000..4b4588685 --- /dev/null +++ b/src/main/java/com/nis/domain/dashboard/codedic/CodeServiceTypeDic.java @@ -0,0 +1,33 @@ +package com.nis.domain.dashboard.codedic; + +public class CodeServiceTypeDic { + private Integer id; + + private String serviceType; + + private String viewCode; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getServiceType() { + return serviceType; + } + + public void setServiceType(String serviceType) { + this.serviceType = serviceType == null ? null : serviceType.trim(); + } + + public String getViewCode() { + return viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode == null ? null : viewCode.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/nis/domain/dashboard/codedic/CodeWebServiceDic.java b/src/main/java/com/nis/domain/dashboard/codedic/CodeWebServiceDic.java new file mode 100644 index 000000000..d99624362 --- /dev/null +++ b/src/main/java/com/nis/domain/dashboard/codedic/CodeWebServiceDic.java @@ -0,0 +1,53 @@ +package com.nis.domain.dashboard.codedic; + +public class CodeWebServiceDic { + private Integer id; + + private String website; + + private String domainName; + + private String viewCode; + + private String icon; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website == null ? null : website.trim(); + } + + public String getDomainName() { + return domainName; + } + + public void setDomainName(String domainName) { + this.domainName = domainName == null ? null : domainName.trim(); + } + + public String getViewCode() { + return viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode == null ? null : viewCode.trim(); + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon == null ? null : icon.trim(); + } +} \ No newline at end of file diff --git a/src/main/java/com/nis/util/CodeDicUtils.java b/src/main/java/com/nis/util/CodeDicUtils.java new file mode 100644 index 000000000..54e6b1a43 --- /dev/null +++ b/src/main/java/com/nis/util/CodeDicUtils.java @@ -0,0 +1,163 @@ +package com.nis.util; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.stereotype.Service; + +import com.nis.domain.dashboard.codedic.CodeAppDic; +import com.nis.domain.dashboard.codedic.CodeBehaviorTypeDic; +import com.nis.domain.dashboard.codedic.CodeBrowserTypeDic; +import com.nis.domain.dashboard.codedic.CodeOsTypeDic; +import com.nis.domain.dashboard.codedic.CodeProtocolTypeDic; +import com.nis.domain.dashboard.codedic.CodeServiceTypeDic; +import com.nis.domain.dashboard.codedic.CodeWebServiceDic; +import com.nis.web.dao.dashboard.codedic.CodeAppDicDao; +import com.nis.web.dao.dashboard.codedic.CodeBehaviorTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeBrowserTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeOsTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeProtocolTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeResult; +import com.nis.web.dao.dashboard.codedic.CodeServiceTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeWebServiceDicDao; +import com.nis.web.service.SpringContextHolder; +@Service +public class CodeDicUtils { + private final static CodeAppDicDao codeAppDicDao = SpringContextHolder.getBean(CodeAppDicDao.class); + private final static CodeBehaviorTypeDicDao codeBehaviorTypeDicDao = SpringContextHolder.getBean(CodeBehaviorTypeDicDao.class); + private final static CodeBrowserTypeDicDao codeBrowserTypeDicDao = SpringContextHolder.getBean(CodeBrowserTypeDicDao.class); + private final static CodeOsTypeDicDao codeOsTypeDicDao = SpringContextHolder.getBean(CodeOsTypeDicDao.class); + private final static CodeProtocolTypeDicDao codeProtocolTypeDicDao = SpringContextHolder.getBean(CodeProtocolTypeDicDao.class); + private final static CodeServiceTypeDicDao codeServiceTypeDicDao = SpringContextHolder.getBean(CodeServiceTypeDicDao.class); + private final static CodeWebServiceDicDao codeWebServiceDicDao = SpringContextHolder.getBean(CodeWebServiceDicDao.class); + + + private static final String APP_CODE="appCode"; + private static final String BEHAVIOR_CODE="behaviorCode"; + private static final String BROWSER_CODE="browserCode"; + private static final String OS_CODE="osCode"; + private static final String PROTOCOL_CODE="protocolCode"; + private static final String SERVICE_CODE="serviceCode"; + private static final String WEB_CODE="webCode"; + /** + * 适用于大屏图表标签显示 + */ + public static List getCodeList(String name) { +// List menuList = (List)getCache(CACHE_MENU_LIST); +// if (menuList == null){ +// SysUser user = getUser(); +// if (user.isAdmin()){ +// menuList = sysMenuDao.findAllList(new SysMenu()); +// }else{ +// menuList = sysMenuDao.findSysMenuByUserId(user.getId()); +// } +// putCache(CACHE_MENU_LIST, menuList); +// } + + 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); + } + 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); + } + 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); + } + 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); + } + 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); + } + 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); + } + 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); + } + return result; + } + return result; + } + public static void main(String[] args) { + getCodeList(APP_CODE); + } + +} diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java index b27d47323..2f9dd8f2a 100644 --- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java +++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java @@ -10,6 +10,7 @@ package com.nis.util.httpclient; import java.io.IOException; import java.net.SocketTimeoutException; +import java.net.URI; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -137,7 +138,9 @@ public class HttpClientUtil { } HttpGet request = new HttpGet(uriBuilder.build()); request.setConfig(requestConfig); - + URI uri = request.getURI(); + logger.info(uri); + System.err.println(uri); response = getHttpClient().execute(request); int status = response.getStatusLine().getStatusCode(); if (status == HttpStatus.SC_OK) { diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeAppDicDao.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeAppDicDao.java new file mode 100644 index 000000000..a3fe0fa5c --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeAppDicDao.java @@ -0,0 +1,11 @@ +package com.nis.web.dao.dashboard.codedic; + +import java.util.List; + +import com.nis.domain.dashboard.codedic.CodeAppDic; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface CodeAppDicDao { + List getCodeDicList(); +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeAppDicDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeAppDicDao.xml new file mode 100644 index 000000000..df9fa7084 --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeAppDicDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + id, app_name, app_name_zh, view_code, icon, behavior, core_app + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBehaviorTypeDicDao.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBehaviorTypeDicDao.java new file mode 100644 index 000000000..53ba289f4 --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBehaviorTypeDicDao.java @@ -0,0 +1,12 @@ +package com.nis.web.dao.dashboard.codedic; + +import java.util.List; + +import com.nis.domain.dashboard.codedic.CodeBehaviorTypeDic; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface CodeBehaviorTypeDicDao { + List getCodeDicList(); + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBehaviorTypeDicDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBehaviorTypeDicDao.xml new file mode 100644 index 000000000..4ba5e221a --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBehaviorTypeDicDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + id, behavior_type, view_code + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBrowserTypeDicDao.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBrowserTypeDicDao.java new file mode 100644 index 000000000..74de6a0ed --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBrowserTypeDicDao.java @@ -0,0 +1,12 @@ +package com.nis.web.dao.dashboard.codedic; + +import java.util.List; + +import com.nis.domain.dashboard.codedic.CodeBrowserTypeDic; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface CodeBrowserTypeDicDao { + List getCodeDicList(); + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBrowserTypeDicDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBrowserTypeDicDao.xml new file mode 100644 index 000000000..123fd815a --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeBrowserTypeDicDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + id, browser_type, view_code, icon + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeOsTypeDicDao.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeOsTypeDicDao.java new file mode 100644 index 000000000..cca4a3d2f --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeOsTypeDicDao.java @@ -0,0 +1,12 @@ +package com.nis.web.dao.dashboard.codedic; + +import java.util.List; + +import com.nis.domain.dashboard.codedic.CodeOsTypeDic; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface CodeOsTypeDicDao { + List getCodeDicList(); + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeOsTypeDicDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeOsTypeDicDao.xml new file mode 100644 index 000000000..39f52f586 --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeOsTypeDicDao.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + id, os_type, view_code, icon + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeProtocolTypeDicDao.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeProtocolTypeDicDao.java new file mode 100644 index 000000000..c1aeb7465 --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeProtocolTypeDicDao.java @@ -0,0 +1,12 @@ +package com.nis.web.dao.dashboard.codedic; + +import java.util.List; + +import com.nis.domain.dashboard.codedic.CodeProtocolTypeDic; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface CodeProtocolTypeDicDao { + List getCodeDicList(); + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeProtocolTypeDicDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeProtocolTypeDicDao.xml new file mode 100644 index 000000000..149031436 --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeProtocolTypeDicDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + id, protocol_type, view_code + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeResult.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeResult.java new file mode 100644 index 000000000..00e948b0e --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeResult.java @@ -0,0 +1,29 @@ +package com.nis.web.dao.dashboard.codedic; + +public class CodeResult { + + private String item; + private String code; + private Integer coreApp; + + public String getItem() { + return item; + } + public void setItem(String item) { + this.item = item; + } + public String getCode() { + return code; + } + public void setCode(String code) { + this.code = code; + } + public Integer getCoreApp() { + return coreApp; + } + public void setCoreApp(Integer coreApp) { + this.coreApp = coreApp; + } + + +} diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeServiceTypeDicDao.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeServiceTypeDicDao.java new file mode 100644 index 000000000..6efb3782c --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeServiceTypeDicDao.java @@ -0,0 +1,11 @@ +package com.nis.web.dao.dashboard.codedic; + +import java.util.List; + +import com.nis.domain.dashboard.codedic.CodeServiceTypeDic; +import com.nis.web.dao.MyBatisDao; +@MyBatisDao +public interface CodeServiceTypeDicDao { + List getCodeDicList(); + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeServiceTypeDicDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeServiceTypeDicDao.xml new file mode 100644 index 000000000..61b0cfedd --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeServiceTypeDicDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + id, service_type, view_code + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeWebServiceDicDao.java b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeWebServiceDicDao.java new file mode 100644 index 000000000..c50483d2c --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeWebServiceDicDao.java @@ -0,0 +1,12 @@ +package com.nis.web.dao.dashboard.codedic; + +import java.util.List; + +import com.nis.domain.dashboard.codedic.CodeWebServiceDic; +import com.nis.web.dao.MyBatisDao; + +@MyBatisDao +public interface CodeWebServiceDicDao { + List getCodeDicList(); + +} \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/codedic/CodeWebServiceDicDao.xml b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeWebServiceDicDao.xml new file mode 100644 index 000000000..46142fb98 --- /dev/null +++ b/src/main/java/com/nis/web/dao/dashboard/codedic/CodeWebServiceDicDao.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + id, website, domain_name, view_code, icon + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/log/CodeDicService.java b/src/main/java/com/nis/web/service/log/CodeDicService.java new file mode 100644 index 000000000..086c3b454 --- /dev/null +++ b/src/main/java/com/nis/web/service/log/CodeDicService.java @@ -0,0 +1,130 @@ +package com.nis.web.service.log; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.nis.domain.dashboard.codedic.CodeAppDic; +import com.nis.domain.dashboard.codedic.CodeBehaviorTypeDic; +import com.nis.domain.dashboard.codedic.CodeBrowserTypeDic; +import com.nis.domain.dashboard.codedic.CodeOsTypeDic; +import com.nis.domain.dashboard.codedic.CodeProtocolTypeDic; +import com.nis.domain.dashboard.codedic.CodeServiceTypeDic; +import com.nis.domain.dashboard.codedic.CodeWebServiceDic; +import com.nis.web.dao.dashboard.codedic.CodeAppDicDao; +import com.nis.web.dao.dashboard.codedic.CodeBehaviorTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeBrowserTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeOsTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeProtocolTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeResult; +import com.nis.web.dao.dashboard.codedic.CodeServiceTypeDicDao; +import com.nis.web.dao.dashboard.codedic.CodeWebServiceDicDao; +@Service +public class CodeDicService { + @Autowired + private static CodeAppDicDao codeAppDicDao; + @Autowired + private static CodeBehaviorTypeDicDao codeBehaviorTypeDicDao; + @Autowired + private static CodeBrowserTypeDicDao codeBrowserTypeDicDao; + @Autowired + private static CodeOsTypeDicDao codeOsTypeDicDao; + @Autowired + private static CodeProtocolTypeDicDao codeProtocolTypeDicDao; + @Autowired + private static CodeServiceTypeDicDao codeServiceTypeDicDao; + @Autowired + private static CodeWebServiceDicDao codeWebServiceDicDao; + + + private static final String APP_CODE="appCode"; + private static final String BEHAVIOR_CODE="behaviorCode"; + private static final String BROWSER_CODE="browserCode"; + private static final String OS_CODE="osCode"; + private static final String PROTOCOL_CODE="protocolCode"; + private static final String SERVICE_CODE="serviceCode"; + private static final String WEB_CODE="webCode"; + /** + * 适用于大屏图表标签显示 + */ + public static List getCodeList(String name) { + List result = new ArrayList<>(); + if (name.equals(APP_CODE)) { + List codeDicList = codeAppDicDao.getCodeDicList(); + CodeResult codeResult = new CodeResult(); + for (int i = 0; i < codeDicList.size(); i++) { + 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 = codeBehaviorTypeDicDao.getCodeDicList(); + CodeResult codeResult = new CodeResult(); + for (int i = 0; i < codeDicList.size(); i++) { + 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 = codeBrowserTypeDicDao.getCodeDicList(); + CodeResult codeResult = new CodeResult(); + for (int i = 0; i < codeDicList.size(); i++) { + 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 = codeOsTypeDicDao.getCodeDicList(); + CodeResult codeResult = new CodeResult(); + for (int i = 0; i < codeDicList.size(); i++) { + 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 = codeProtocolTypeDicDao.getCodeDicList(); + CodeResult codeResult = new CodeResult(); + for (int i = 0; i < codeDicList.size(); i++) { + 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 = codeServiceTypeDicDao.getCodeDicList(); + CodeResult codeResult = new CodeResult(); + for (int i = 0; i < codeDicList.size(); i++) { + 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 = codeWebServiceDicDao.getCodeDicList(); + CodeResult codeResult = new CodeResult(); + for (int i = 0; i < codeDicList.size(); i++) { + codeResult.setItem(codeDicList.get(i).getWebsite()); + codeResult.setCode(codeDicList.get(i).getViewCode()); + + result.add(codeResult); + } + return result; + } + return result; + } + public static void main(String[] args) { + getCodeList(APP_CODE); + } +} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp index 20d39dbec..0f3767798 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -241,11 +241,7 @@ ${_log.sPort } ${_log.dIp } ${_log.dPort } - - - ${logProtocol.itemValue} - - + ${_log.transProto } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index bc38bea87..824956ea5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -173,7 +173,7 @@ $(document).ready(function(){ - + @@ -202,11 +202,7 @@ $(document).ready(function(){ ${log.foundTime} ${log.recvTime} - - - - - + ${log.transProto} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp index 4b08e0c2d..e0aeaa43a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -207,11 +207,7 @@ ${_log.sPort } ${_log.dIp } ${_log.dPort } - - - ${logProtocol.itemValue} - - + ${_log.transProto } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp index c6cc81926..9935fe8f5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -192,11 +192,7 @@ ${_log.sPort } ${_log.dIp } ${_log.dPort } - - - ${logProtocol.itemValue} - - + ${_log.transProto } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index 0511bc72c..655d1e02b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -196,11 +196,7 @@ $(document).ready(function(){ ${log.foundTime} ${log.recvTime} - - - - - + ${log.transProto} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index d5ccb3331..006cc08cc 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -204,11 +204,7 @@ $(document).ready(function(){ ${log.foundTime} ${log.recvTime} - - - - - + ${log.transProto} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index e8ec0c00a..dfa079e04 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -206,11 +206,7 @@ $(document).ready(function(){ ${log.foundTime} ${log.recvTime} - - - - - + ${log.transProto}