From 1a01f78a0838a8d318325abfd15cfbdc63b03339 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@zdjizhi.com>
Date: Fri, 2 Nov 2018 11:23:49 +0800
Subject: [PATCH] =?UTF-8?q?proxy=20intercept=E6=A8=A1=E5=9D=97=E7=9A=84mon?=
 =?UTF-8?q?itor=E5=8A=A8=E4=BD=9C=E5=B1=95=E7=A4=BA=E4=BD=8DIntercept?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/excel/ExportExcel.java  | 29 -------------------
 .../views/cfg/intercept/interceptForm.jsp     |  5 +++-
 .../views/cfg/intercept/interceptList.jsp     | 24 +++++++++++----
 3 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java
index 44db587ed..c9f9f7834 100644
--- a/src/main/java/com/nis/util/excel/ExportExcel.java
+++ b/src/main/java/com/nis/util/excel/ExportExcel.java
@@ -352,35 +352,6 @@ public class ExportExcel {
 			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
 			index++;
 		}
-		if("group".equals(headerStr)) {
-			commentStr="";
-			//查询ip复用地址池配置的policyGroup列表
-			List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(2);
-			if(!StringUtil.isEmpty(list)){
-				for (PolicyGroupInfo policyGroupInfo : list) {
-					commentStr=commentStr+policyGroupInfo.getGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n";
-					index++;
-				}
-			}
-			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
-			index++;
-		}
-		if("isp".equals(headerStr)) {
-			commentStr="";
-			List<Integer> itTypeList = new ArrayList<Integer>();
-			itTypeList.add(Constants.ITEM_TYPE_ISP);
-			SysDictInfo sysDictInfo=new SysDictInfo();
-			sysDictInfo.setConditionType(itTypeList);
-			List<SysDictInfo> isps=sysDictInfoDao.findAllSysDictInfo(sysDictInfo,null);
-			if(!StringUtil.isEmpty(isps)){
-				for (SysDictInfo _sysDictInfo : isps) {
-					commentStr=commentStr+_sysDictInfo.getItemCode()+"（"+_sysDictInfo.getItemValue()+"）\n";
-					index++;
-				}
-			}
-			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
-			index++;
-		}
 		if(region.getRegionType().equals(1)){//IP配置
 			//ip配置需要导入的信息：srcIp srcPort destIp destPort Protocol Direction
 			//确定需要导入的srcIp srcPort destIp destPort信息
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index a3a24b4f6..9580bebd1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -203,7 +203,10 @@
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-																	<c:if test="${dict.itemCode eq service.action }">
+																	<c:if test="${(dict.itemCode eq service.action) && (service.action eq 1) }">
+																			<spring:message code="intercept"/>
+																	</c:if>
+																	<c:if test="${(dict.itemCode eq service.action) && (service.action ne 1) }">
 																		<spring:message code="${dict.itemValue }"/>
 																	</c:if>
 																</c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index aa0e094f7..5fd497daf 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -172,7 +172,12 @@
 	                                  		 <form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
 													<form:option value=""><spring:message code="select"/></form:option>
 													<c:forEach items="${serviceList}" var="service">
-														<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+														<c:if test="${service.action eq 1}">
+															<form:option value="${service.action }"><spring:message code="intercept"/></form:option>
+														</c:if>
+														<c:if test="${service.action ne 1}">
+															<form:option value="${service.action }"><spring:message code="action_${service.actionCode }"/></form:option>
+														</c:if>
 													</c:forEach>
 											 </form:select>
 											 <form:select path="isValid" class="selectpicker select2 input-small" >
@@ -390,11 +395,18 @@
 									<td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
 									<td>
-										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-											<c:if test="${dict.itemCode eq indexCfg.action }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
+										<c:if test="${indexCfg.action eq 1}">
+											<spring:message code="intercept"/>
+										</c:if>
+										<c:if test="${indexCfg.action ne 1}">
+											<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+												<c:if test="${dict.itemCode eq indexCfg.action }">
+													<spring:message code="${dict.itemValue }"/>
+												</c:if>
+												
+											</c:forEach>
+										</c:if>
+										
 									</td>
 									
 									 <c:if test="${cfg.functionId ne 212 }">