gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整IS_SHOW_BUSINESS_TYPE字典开关只对协议以及应用中用到特定服务的页面生效

Browse Source
This commit is contained in:
wangxin
2018-09-14 10:24:23 +08:00
parent 30b0cf2ffe
commit 95892b46d5
7 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java
View File

@@ -214,19 +214,7 @@ public class SpecificServiceCfgController extends BaseController {
map2.put("name","root_node");
//map2.put("placeholder","0");
mapList.add(map2);
List<SysDataDictionaryItem> isShowList=DictUtils.getDictList("IS_SHOW_BUSINESS_TYPE");
boolean isShowBusinessType=false;
if(isShowList!=null&&isShowList.size()>0) {
for(SysDataDictionaryItem item:isShowList) {
if(item.getStatus()==1) {//可用
if("1".equals(item.getItemCode())) {
isShowBusinessType=true;
break;
}
}
}
}
if((specific==null||!specific)&&isShowBusinessType) {
if(specific==null||!specific) {
Properties props=this.getMsgProp();
List<SysDataDictionaryItem> businessTypeList=Lists.newArrayList();
if(cfgType==1) {

10
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -229,13 +229,21 @@ var delContent = function(contentClassName, addBtnClassName) {
<div class="row">
<div class="col-md-6">
<div class="form-group">
<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
<c:if test="${showBusinessType.itemCode==1 }">
<c:set var="isShowBusinessType" value="true"/>
</c:if>
<c:if test="${showBusinessType.itemCode!=1 }">
<c:set var="isShowBusinessType" value="false"/>
</c:if>
</c:forEach>
<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
<div class="col-md-6">
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName" notAllowSelectParent="true" enableSearch="true"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId="0"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1&specific=${!isShowBusinessType}" extId="0"
notAllowSelectRoot="true" cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>

10
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
View File

@@ -132,11 +132,19 @@
</div>
<div class="pull-left">
<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
<c:if test="${showBusinessType.itemCode==1 }">
<c:set var="isShowBusinessType" value="true"/>
</c:if>
<c:if test="${showBusinessType.itemCode!=1 }">
<c:set var="isShowBusinessType" value="false"/>
</c:if>
</c:forEach>
<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" enableSearch="true"
labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1&specific=${!isShowBusinessType}" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left">

13
src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
View File

@@ -131,9 +131,6 @@ var delContent = function(contentClassName, addBtnClassName) {
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'basic_protocol'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<h3 class="page-title">
<spring:message code="basic_protocol"></spring:message>
</h3>
@@ -181,13 +178,21 @@ var delContent = function(contentClassName, addBtnClassName) {
<div class="col-md-6">
<div class="form-group">
<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
<c:if test="${showBusinessType.itemCode==1 }">
<c:set var="isShowBusinessType" value="true"/>
</c:if>
<c:if test="${showBusinessType.itemCode!=1 }">
<c:set var="isShowBusinessType" value="false"/>
</c:if>
</c:forEach>
<c:set var="spec_service_id"><spring:message code="basic_protocol"/></c:set>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="basic_protocol"/></label>
<div class="col-md-6">
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName" notAllowSelectParent="true" enableSearch="true"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=3&specific=${!isShowBusinessType}" extId="0"
notAllowSelectRoot="true" cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>

12
src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
View File

@@ -135,11 +135,19 @@
</div>
<div class="pull-left">
<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
<c:if test="${showBusinessType.itemCode==1 }">
<c:set var="isShowBusinessType" value="true"/>
</c:if>
<c:if test="${showBusinessType.itemCode!=1 }">
<c:set var="isShowBusinessType" value="false"/>
</c:if>
</c:forEach>
<c:set var="spec_service_id"><spring:message code="basic_protocol"/></c:set>
<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}"
<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}"
labelName="parent.specServiceName" notAllowSelectParent="true" notAllowSelectRoot="true" enableSearch="true"
labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=3&specific=${!isShowBusinessType}" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left">

13
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
View File

@@ -155,9 +155,6 @@ var delContent = function(contentClassName, addBtnClassName) {
<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'encrypted_tunnel_behavior'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<h3 class="page-title">
<spring:message code="encrypted_tunnel_behavior"></spring:message>
</h3>
@@ -253,13 +250,21 @@ var delContent = function(contentClassName, addBtnClassName) {
<div class="row">
<div class="col-md-6">
<div class="form-group">
<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
<c:if test="${showBusinessType.itemCode==1 }">
<c:set var="isShowBusinessType" value="true"/>
</c:if>
<c:if test="${showBusinessType.itemCode!=1 }">
<c:set var="isShowBusinessType" value="false"/>
</c:if>
</c:forEach>
<c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="encrypted_tunnel_behavior"/></label>
<div class="col-md-6">
<sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}"
labelName="parent.specServiceName" enableSearch="true"
labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=2&specific=${!isShowBusinessType}" extId="0"
notAllowSelectRoot="true" cssClass="form-control required"/>
</div>
<div for="parent.specServiceName"></div>

13
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
View File

@@ -92,9 +92,6 @@
<body>
<div class="page-content">
<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
<c:if test="${dict.itemValue eq 'encrypted_tunnel_behavior'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
</c:forEach>
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="encryptedtunnelbehav:config">
<button type="button" class="btn btn-primary"
@@ -135,11 +132,19 @@
</div>
<div class="pull-left">
<c:forEach items="${fns:getDictList('IS_SHOW_BUSINESS_TYPE') }" var="showBusinessType">
<c:if test="${showBusinessType.itemCode==1 }">
<c:set var="isShowBusinessType" value="true"/>
</c:if>
<c:if test="${showBusinessType.itemCode!=1 }">
<c:set var="isShowBusinessType" value="false"/>
</c:if>
</c:forEach>
<c:set var="spec_service_id"><spring:message code="encrypted_tunnel_behavior"/></c:set>
<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}"
labelName="parent.specServiceName" notAllowSelectRoot="true" enableSearch="true"
labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=2&specific=${!isShowBusinessType}" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left">