diff --git a/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch b/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch
new file mode 100644
index 000000000..16faa10bb
--- /dev/null
+++ b/.externalToolBuilders/org.eclipse.m2e.core.maven2Builder.launch
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch b/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch
new file mode 100644
index 000000000..aea518e91
--- /dev/null
+++ b/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder.launch
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.wst.xsl.core.prefs b/.settings/org.eclipse.wst.xsl.core.prefs
new file mode 100644
index 000000000..437d5482b
--- /dev/null
+++ b/.settings/org.eclipse.wst.xsl.core.prefs
@@ -0,0 +1,11 @@
+CHECK_CALL_TEMPLATES=2
+CHECK_XPATHS=2
+CIRCULAR_REF=2
+DUPLICATE_PARAMETER=2
+EMPTY_PARAM=1
+MISSING_INCLUDE=2
+MISSING_PARAM=1
+NAME_ATTRIBUTE_EMPTY=2
+NAME_ATTRIBUTE_MISSING=2
+TEMPLATE_CONFLICT=2
+eclipse.preferences.version=1
diff --git a/src/main/java/com/nis/domain/SysMenu.java b/src/main/java/com/nis/domain/SysMenu.java
index bf91bcbfa..568b98b94 100644
--- a/src/main/java/com/nis/domain/SysMenu.java
+++ b/src/main/java/com/nis/domain/SysMenu.java
@@ -51,6 +51,8 @@ public class SysMenu extends BaseEntity{
private String menuBg;
+ private Integer isTop;
+
private List children = new ArrayList();
public SysMenu(){
@@ -259,5 +261,15 @@ public class SysMenu extends BaseEntity{
public void setCode(String code) {
this.code = code;
}
+
+ public Integer getIsTop() {
+ return isTop;
+ }
+
+ public void setIsTop(Integer isTop) {
+ this.isTop = isTop;
+ }
+
+
}
\ No newline at end of file
diff --git a/src/main/java/com/nis/util/TreeUtil.java b/src/main/java/com/nis/util/TreeUtil.java
index 50094bd4c..34920a6e4 100644
--- a/src/main/java/com/nis/util/TreeUtil.java
+++ b/src/main/java/com/nis/util/TreeUtil.java
@@ -1,6 +1,7 @@
package com.nis.util;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import com.nis.domain.SysMenu;
@@ -21,7 +22,6 @@ public final class TreeUtil {
public List buildTree(){
List newMenuList = new ArrayList();
-
for (SysMenu menu : menuList) {
if (menu.getParent().getId().equals(1l)) {
if (isBusinessOfAdmin(menu.getName())) {
@@ -35,6 +35,21 @@ public final class TreeUtil {
return newMenuList;
}
+ public List buildTreeLeft(){
+ List newMenuList = new ArrayList();
+ for (SysMenu menu : menuList) {
+ if (menu.getIsTop().equals(1)) {
+ if (isBusinessOfAdmin(menu.getName())) {
+ continue;
+ }
+ build(menu);
+ newMenuList.add(menu);
+ }
+ }
+
+ return newMenuList;
+ }
+
/**
* 过滤admin的业务功能
* @return
diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
index 1fca05138..e5658cc75 100644
--- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
@@ -1,6 +1,7 @@
package com.nis.web.controller.configuration;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
/**
* IP相关配置控制类
@@ -8,6 +9,31 @@ import org.springframework.stereotype.Controller;
*
*/
@Controller
+@RequestMapping("${adminPath}/cfg/ip")
public class IpCfgController {
+
+
+ @RequestMapping(value = {"ipWhiteList"})
+ public String ipWhiteList() {
+ return "/cfg/ipWhiteList";
+ }
+
+ @RequestMapping(value = {"ipWhiteForm"})
+ public String ipWhiteForm() {
+ return "/cfg/ipWhiteForm";
+ }
+
+
+ @RequestMapping(value = {"ipBlockList"})
+ public String ipBlockList() {
+ return "/cfg/ipBlockList";
+ }
+
+
+ @RequestMapping(value = {"ipBlockForm"})
+ public String ipBlockForm() {
+ return "/cfg/ipBlockForm";
+ }
+
}
diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
new file mode 100644
index 000000000..6506f1ba7
--- /dev/null
+++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java
@@ -0,0 +1,30 @@
+package com.nis.web.controller.configuration;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.nis.web.controller.BaseController;
+
+/**
+ * 测试类
+ *
+ */
+@Controller
+@RequestMapping("${adminPath}/cfg/request")
+public class RequestInfoController extends BaseController{
+
+
+ @RequestMapping(value = {"list"})
+ public String list() {
+ return "/cfg/requestList";
+ }
+
+
+ @RequestMapping(value = {"form"})
+ public String form() {
+ return "/cfg/requestForm";
+ }
+
+
+
+}
diff --git a/src/main/java/com/nis/web/dao/SysMenuDao.xml b/src/main/java/com/nis/web/dao/SysMenuDao.xml
index f067e00dc..eb314c165 100644
--- a/src/main/java/com/nis/web/dao/SysMenuDao.xml
+++ b/src/main/java/com/nis/web/dao/SysMenuDao.xml
@@ -22,7 +22,9 @@
a.del_flag,
a.quick_action,
a.menu_bg,
- p.name AS "parent.name"
+ p.name AS "parent.name",
+ a.is_top
+
" />
+ 
+ <%-- --%>
+ <%-- ${secondMenu.name} --%>
+
+
+
+
+ 
+ 
+ 
Johny Smith 
+ 