diff --git a/src/main/java/com/nis/domain/configuration/BaseCfg.java b/src/main/java/com/nis/domain/configuration/BaseCfg.java index 8eae2e6f8..d8e679dfe 100644 --- a/src/main/java/com/nis/domain/configuration/BaseCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseCfg.java @@ -15,8 +15,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.domain.BaseEntity; +import com.nis.domain.SysMenu; import com.nis.util.Constants; +import com.nis.util.StringUtil; +import com.nis.util.StringUtils; import com.nis.util.excel.ExcelField; +import com.nis.web.security.UserUtils; /** * @ClassName: BaseConfig.java @@ -196,6 +200,14 @@ public class BaseCfg extends BaseEntity implements Cloneable{ * 菜单ID */ protected Integer functionId; + /** + * 菜单权限 + */ + protected String permission; + /** + * 菜单权限 + */ + protected String menuNameCode; /** * do_log属性在界面（do_log:0不需要1记录所有日志2只记录结构化日志。默认是2） @@ -250,6 +262,33 @@ public class BaseCfg extends BaseEntity implements Cloneable{ */ public void setFunctionId(Integer functionId) { this.functionId = functionId; + if(!StringUtil.isEmpty(functionId) && StringUtil.isEmpty(this.menuNameCode)){ + List list = UserUtils.getMenuList(); + if(!StringUtil.isEmpty(list)) { + for (SysMenu menu :list) { + if (!StringUtil.isEmpty(menu.getCode()) && !StringUtil.isEmpty(menu.getFunctionId()) &&menu.getFunctionId().equals(functionId)) { + this.setMenuNameCode(menu.getCode()); + + } + + } + } + } + + } + + public String getMenuNameCode() { + return menuNameCode; + } + public void setMenuNameCode(String menuNameCode) { + this.menuNameCode = menuNameCode; + } + + public String getPermission() { + return permission; + } + public void setPermission(String permission) { + this.permission = permission; } /** * cfgId diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp index df3944a5b..ac6105980 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp @@ -40,9 +40,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp index d206e45af..f0d6d4215 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp @@ -46,7 +46,7 @@

- +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp index 47b656bf7..73fe1e8f7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp @@ -46,9 +46,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp index da881696a..76be9cc4c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp @@ -47,9 +47,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp index 73793adcd..68f83f8bf 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp @@ -61,14 +61,9 @@ $(function(){
-<%--

- - - - - - -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp index 26c1a8352..a00ef0c6d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp @@ -61,9 +61,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp index 05acea677..d7c552f34 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp @@ -28,9 +28,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp index b5899a909..c612de0b6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp @@ -98,9 +98,9 @@ var delContent = function(contentClassName, addBtnClassName) { -<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp index e727d3c10..1ee80e58d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp @@ -167,9 +167,9 @@ var delContent = function(contentClassName, addBtnClassName) {
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp index afcae4c79..b472b80b8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp @@ -61,9 +61,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp index 726222400..11c353bc7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp @@ -55,9 +55,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp index 0229183c1..7d971563b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp @@ -144,9 +144,9 @@ $(function(){
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp index 3111d220d..ac8152714 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp @@ -64,9 +64,9 @@ var delContent = function(contentClassName, addBtnClassName) {
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp index d0ee77f83..9439ea63f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp @@ -96,9 +96,9 @@ var delContent = function(contentClassName, addBtnClassName) {
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp index ce8e3aa11..c48181289 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp @@ -100,13 +100,9 @@ function hiddenlevel(){
-<%--

- - - - - -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp index b74f1512c..440085c7e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp @@ -65,9 +65,9 @@ var delContent = function(contentClassName, addBtnClassName) {
-<%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp index a3aa6ea9a..ffabccdfe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp @@ -88,9 +88,9 @@ var delContent = function(contentClassName, addBtnClassName) {
- <%--

- -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp index a1e13513d..509e69711 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp @@ -75,13 +75,9 @@ function hiddenlevel(){
-<%--

- - - - - -

--%> +

+ +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp index 09d49cdff..c52fcfb8d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp @@ -63,11 +63,7 @@ $(function(){

- - <%-- - - - --%> +

diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp.bak b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp.bak index 991995a81..98ade2dae 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp.bak +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp.bak @@ -40,16 +40,16 @@ var flag = true; var subscribeId=0; - //存在隐藏的subscribeId，不算进域配置 + //瀛樺湪闅愯棌鐨剆ubscribeId锛屼笉绠楄繘鍩熼厤缃� if($(".boxSolid.hidden").hasClass("subscribeId")){ subscribeId=1; } - //代表所有业务都隐藏了，提示必须增加一种业务数据 + //浠ｈ〃鎵�鏈変笟鍔￠兘闅愯棌浜嗭紝鎻愮ず蹇呴』澧炲姞涓�绉嶄笟鍔℃暟鎹� if(($(".boxSolid").length - 1) == ($(".boxSolid.hidden").length - subscribeId)){ top.$.jBox.tip("", ""); return; } - //代表所有区域都隐藏了，提示必须增加个区域信息 + //浠ｈ〃鎵�鏈夊尯鍩熼兘闅愯棌浜嗭紝鎻愮ず蹇呴』澧炲姞涓尯鍩熶俊鎭� if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); if($("#areaIp").hasClass("hidden")) $("#areaIsp").find(".glyphicon-plus").click(); @@ -65,10 +65,10 @@ flag = false; } }) - //keywords非空校验完成校验二进制字符串 + //keywords闈炵┖鏍￠獙瀹屾垚鏍￠獙浜岃繘鍒跺瓧绗︿覆 $(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){ var isHexbin=$(this).val(); - if(isHexbin == 1){ //十六进制 + if(isHexbin == 1){ //鍗佸叚杩涘埗 var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); keywords=keywords.replace("***and***","") if(keywords != ''){ @@ -87,7 +87,7 @@ flag=flag1; } if(flag){ - //将disable属性的元素删除 + //灏哾isable灞炴�х殑鍏冪礌鍒犻櫎 $(".disabled").each(function(){ $(this).remove(); }); @@ -101,14 +101,14 @@ }, errorContainer : "#messageBox", }); - //业务内容增加 + //涓氬姟鍐呭澧炲姞 /* $("span[title='add']").on("click", function() { $(".ipPort0").removeClass("hidden"); }); */ }); - //业务窗口打开 + //涓氬姟绐楀彛鎵撳紑 var addContent = function(obj, contentClassName) { var showDiv = $(obj).parent().parent().next(); $(showDiv).removeClass("hidden").removeClass( @@ -119,7 +119,7 @@ $(obj).addClass("hidden"); } - //业务窗口关闭 + //涓氬姟绐楀彛鍏抽棴 var delContent = function(contentClassName, addBtnClassName) { $("." + contentClassName).addClass("hidden").addClass("disabled"); /* $("."+contentClassName).find("input,select").each(function(){ @@ -134,7 +134,7 @@

- +

@@ -174,7 +174,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp.bak b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp.bak index bd48b17b4..22d7bbb97 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp.bak +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp.bak @@ -22,7 +22,7 @@