From db040c27522a1f6b1e45d71388d1f5c77616a671 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Mon, 22 Apr 2019 11:13:26 +0800
Subject: [PATCH] =?UTF-8?q?(1)=E5=88=A0=E9=99=A4=E8=B0=83=E7=94=A8switchIp?=
 =?UTF-8?q?Type=E6=96=B9=E6=B3=95=E7=9A=84=E9=A1=B5=E9=9D=A2=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=20(2)Stream=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E8=A1=A8=E5=8D=95Block,rat?=
 =?UTF-8?q?elimt=E6=9C=89=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89IP=E6=97=B6=E7=9A=84=E9=94=99=E4=BD=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/controller/configuration/AppCfgController.java  | 5 +++--
 .../configuration/EncryptedTunnelBehaviorController.java    | 5 +++--
 src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp  | 2 +-
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp     | 4 ----
 src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp     | 4 ----
 .../cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp      | 2 +-
 src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp         | 4 ----
 src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp       | 6 ------
 8 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
index 9f29268e3..b5f41e91b 100644
--- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
@@ -12,6 +12,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.taglibs.standard.functions.Functions;
@@ -153,7 +154,7 @@ public class AppCfgController extends BaseController {
 	public String ajaxSslSubList(Model model, Long cfgId, Integer index, Integer compileId) {
 		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId, compileId);
 		List<String[]> tabList = new ArrayList();
-		if (cfg.getIpPortList() != null) {
+		if (CollectionUtils.isNotEmpty(cfg.getIpPortList())) {
 			String cfgType = null;
 			for (IpPortCfg ip : cfg.getIpPortList()) {
 				if (!ip.getCfgType().equals(cfgType)) {
@@ -162,7 +163,7 @@ public class AppCfgController extends BaseController {
 				}
 			}
 		}
-		if (cfg.getNtcSubscribeIdCfgList() != null) {
+		if (CollectionUtils.isNotEmpty(cfg.getNtcSubscribeIdCfgList())) {
 			String cfgType = null;
 			for (NtcSubscribeIdCfg ntc : cfg.getNtcSubscribeIdCfgList()) {
 				if (!ntc.getCfgType().equals(cfgType)) {
diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
index a39221b38..5a0dd7b31 100644
--- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
+++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
@@ -11,6 +11,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
@@ -112,7 +113,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 	public String ajaxSslSubList(Model model, Long cfgId, Integer index, Integer compileId) {
 		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId, compileId);
 		List<String[]> tabList = new ArrayList();
-		if (cfg.getIpPortList() != null) {
+		if (CollectionUtils.isNotEmpty(cfg.getIpPortList())) {
 			String cfgType = null;
 			for (IpPortCfg ip : cfg.getIpPortList()) {
 				if (!ip.getCfgType().equals(cfgType)) {
@@ -121,7 +122,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 				}
 			}
 		}
-		if (cfg.getNtcSubscribeIdCfgList() != null) {
+		if (CollectionUtils.isNotEmpty(cfg.getNtcSubscribeIdCfgList())) {
 			String cfgType = null;
 			for (NtcSubscribeIdCfg ntc : cfg.getNtcSubscribeIdCfgList()) {
 				if (!ntc.getCfgType().equals(cfgType)) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
index bfe9d0160..0e421abff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicySubList.jsp
@@ -11,7 +11,7 @@
 </style>
 </head>
 
-<c:if test="${fn:length(tabList)==0}">
+<c:if test="${fn:length(tabList)==0 and empty _cfg.schedule}">
 	<div id="NTC_UNIVERSAL_IPTitle${index}"  onclick="switchSubCfgTabInfo('NTC_UNIVERSAL_IP',${index})"
 		class="col-md-1 tabInfo badge-info" name="tabTitle">
 			<spring:message code='NTC_UNIVERSAL_IP' />
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 d9004c2e3..4c8ac1811 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -21,7 +21,6 @@ $(function(){
 		fileType=["mp4","flv","asf","wmv","avi","mpeg","mov","dat","m4v","m4p","m4b","webm","wav","mp3"];
 	}
 	$("#fileNoteInfo").attr("title","<spring:message code='select_file'/>: "+fileType);
-	switchIpType($("select[name$='ipType']"));
 	areaControlInit();
 	$("input[name='isAreaEffective']").on('change',function(){
 		var val=$(this).val();
@@ -38,9 +37,6 @@ $(function(){
 			$("#areaIsp").addClass("hidden");
 		}
 	});
-	$("select[name$='ipType']").on("change",function(){
-		switchIpType($(this));
-	});
 	$("#uploadSrc,#srcFileInfo").on('click',function(){
 		$("#srcFile").trigger("click");
 		
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 509e69711..38b01b215 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
@@ -7,7 +7,6 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
 <script type="text/javascript">
 $(function(){
-	switchIpType($("select[name$='ipType']"));
 	areaControlInit();
 	$("input[name='isAreaEffective']").on('change',function(){
 		var val=$(this).val();
@@ -24,9 +23,6 @@ $(function(){
 			$("#areaIsp").addClass("hidden");
 		}
 	});
-	$("select[name$='ipType']").on("change",function(){
-		switchIpType($(this));
-	});
 	$("input[name='areaType']").on('change',function(){
 		var val=$(this).val();
 		if($(this).is(":visible")){
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
index bfe9d0160..0e421abff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/encrypedTunnelSubList.jsp
@@ -11,7 +11,7 @@
 </style>
 </head>
 
-<c:if test="${fn:length(tabList)==0}">
+<c:if test="${fn:length(tabList)==0 and empty _cfg.schedule}">
 	<div id="NTC_UNIVERSAL_IPTitle${index}"  onclick="switchSubCfgTabInfo('NTC_UNIVERSAL_IP',${index})"
 		class="col-md-1 tabInfo badge-info" name="tabTitle">
 			<spring:message code='NTC_UNIVERSAL_IP' />
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
index 1d03f14e5..96f1043a4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
@@ -8,7 +8,6 @@
 	rel="stylesheet" />
 <script type="text/javascript">
 	$(function() {
-		switchIpType($("select[name$='ipType']"));
 		areaControlInit();
 		$("select[name='cfgType']").on('change', function() {
 			var val = $(this).val();
@@ -48,9 +47,6 @@
 				$("#areaIp").addClass("hidden");
 			}
 		});
-		$("select[name$='ipType']").on("change", function() {
-			switchIpType($(this));
-		});
 		$("#ipCfgFrom").validate(
 				{
 					errorPlacement : function(error, element) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
index ce5621e6b..fcd2b06ea 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
@@ -5,7 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	switchIpType($("select[name$='ipType']"));
 	areaControlInit();
 	$("[name^='ipCfg']").attr("disabled",true);
 	$("[name^='stringCfg']").attr("disabled",true);
@@ -168,11 +167,6 @@ $(function(){
 		}
 		
 	});
-	$(".ipType").on("change",function(){
-		var tableName=$(this).attr("name").replace(".ipType","");
-		switchIpType($(".ipType"));
-	}); 		
-
 });
 </script>
 </head>