From fed87773214ae97dd50d06b53d0a88beb86f2b72 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Mon, 26 Mar 2018 17:34:07 +0800
Subject: [PATCH] =?UTF-8?q?ip=E3=80=81=E5=AD=97=E7=AC=A6=E4=B8=B2=E3=80=81?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/dao/configuration/IpCfgDao.xml  |  4 ++--
 .../webapp/WEB-INF/views/cfg/complexCfgList.jsp | 17 +++++++++++++++--
 src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp | 17 ++++++++++++++---
 .../webapp/WEB-INF/views/cfg/stringCfgList.jsp  | 17 +++++++++++++++--
 .../webapp/WEB-INF/views/systemService/list.jsp |  2 +-
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index ed3b9c847..70ff708a0 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -291,7 +291,7 @@
 			    		AND ${page.alias}.IP_TYPE=#{ipType,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcIp != null and srcIp != ''">
-			    		AND ${page.alias}.SRC_IP=#{srcIp,jdbcType=VARCHAR}
+			    		AND ${page.alias}.SRC_IP like concat('%', #{srcIp,jdbcType=VARCHAR}, '%')
 			    	</if>
 			    	<if test="srcIpMask != null and srcIpMask != ''">
 			    		AND ${page.alias}.SRC_IP_MASK=#{srcIpMask,jdbcType=VARCHAR}
@@ -303,7 +303,7 @@
 			    		AND ${page.alias}.SRC_PORT_MASK=#{srcPortMask,jdbcType=VARCHAR}
 			    	</if>
 			    	<if test="dstIp != null and dstIp !=''">
-			    		AND ${page.alias}.DST_IP=#{dstIp,jdbcType=VARCHAR}
+			    		AND ${page.alias}.DST_IP like concat('%', #{dstIp,jdbcType=VARCHAR}, '%')
 			    	</if>
 			    	<if test="dstIpMask != null and dstIpMask !=''">
 			    		AND ${page.alias}.DST_IP_MASK=#{dstIpMask,jdbcType=VARCHAR}
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 72b2c4580..acbe4e82a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -5,6 +5,17 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script>
  	$(document).ready(function() {
+ 		//搜索框提示语初始化
+		if("${cfg.keywords}"){
+			$("#intype").val("${cfg.keywords}");
+		} else if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		} else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
  		//筛选功能初始化
 		filterActionInit();
 		$("#isAudit").change(function(){
@@ -24,6 +35,8 @@
  	});
 	//查询
  	function page(n,s){
+ 		$("#intype").attr("name",$("#seltype").val());
+ 		
 		$("#pageNo").val(n);
 		$("#pageSize").val(s);
 		$("#searchForm").submit();
@@ -81,8 +94,8 @@
 									<div class="input-group">
                                          <div class="input-group-btn">
                                          
-                                        	<form:select path="" class="selectpicker select2 input-small" >
-                                        		<form:option value="key_word"><spring:message code="key_word"></spring:message></form:option>
+                                        	<form:select path="seltype" class="selectpicker select2 input-small" >
+                                        		<form:option value="keywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 69d043ec3..ccd113334 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -5,8 +5,18 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script>
 	$(document).ready(function() {
-		$("seltype").on("click",function(){
-			alert(2333)
+		//搜索框提示语初始化
+		if("${ipCfg.srcIp}"){
+			$("#intype").val("${ipCfg.srcIp}");
+		} else if("${ipCfg.dstIp}"){
+			$("#intype").val("${ipCfg.dstIp}");
+		} else if("${ipCfg.cfgDesc}"){
+			$("#intype").val("${ipCfg.cfgDesc}");
+		} else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
 		});
 		//筛选功能初始化
 		filterActionInit();
@@ -26,6 +36,7 @@
 	});
 	//查询
  	function page(n,s){
+ 		$("#intype").attr("name",$("#seltype").val());
 		$("#pageNo").val(n);
 		$("#pageSize").val(s);
 		$("#searchForm").submit();
@@ -80,7 +91,7 @@
 										<div class="input-group">
                                             <div class="input-group-btn">
                                             
-                                           		<form:select path="" class="selectpicker select2 input-small" >
+                                           		<form:select path="seltype" class="selectpicker select2 input-small" >
 													<form:option value="srcIp"><spring:message code="client_ip"></spring:message></form:option>
 													<form:option value="dstIp"><spring:message code="server_ip"></spring:message></form:option>
 													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 997b99ebe..4ec7c8ebd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -5,6 +5,17 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script>
  	$(document).ready(function() {
+ 		//搜索框提示语初始化
+		if("${cfg.cfgKeywords}"){
+			$("#intype").val("${cfg.cfgKeywords}");
+		} else if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		} else{
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
+		}
+		$("#seltype").change(function(){
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
+		});
  		//筛选功能初始化
 		filterActionInit();
 		$("#isAudit").change(function(){
@@ -24,6 +35,8 @@
  	});
 	//查询
  	function page(n,s){
+ 		$("#intype").attr("name",$("#seltype").val());
+ 		
 		$("#pageNo").val(n);
 		$("#pageSize").val(s);
 		$("#searchForm").submit();
@@ -80,8 +93,8 @@
 									<div class="input-group">
                                          <div class="input-group-btn">
                                          
-                                        	<form:select path="" class="selectpicker select2 input-small" >
-                                        		<form:option value="key_word"><spring:message code="key_word"></spring:message></form:option>
+                                        	<form:select path="seltype" class="selectpicker select2 input-small" >
+                                        		<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 											</form:select>
 									
diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp
index f97d92883..73fefa75a 100644
--- a/src/main/webapp/WEB-INF/views/systemService/list.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp
@@ -127,7 +127,7 @@ function checkNum(obj) {
 										<c:if test="${2 eq ssi.serviceType }"><spring:message code="multi_domain"/></c:if>
 										<c:if test="${3 eq ssi.serviceType }"><spring:message code="special_service"/></c:if>
 									</td>
-									<td>${ssi.creator.loginId }</td>
+									<td>${ssi.creator.name }</td>
 									<td><fmt:formatDate value="${ssi.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${ssi.serviceDesc }</td>
 									<td>