From 91bad82aa4b3af9b0c803ce11f0ae987f1a97db3 Mon Sep 17 00:00:00 2001
From: zhangshilin <zhangshilin@intranet>
Date: Fri, 23 Mar 2018 11:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=B9=E5=AE=9A=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=9C=8D=E5=8A=A1=E5=99=A8IP=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=AD=97=E5=85=B8=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=20=E8=A1=A5=E5=85=85=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?ip=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E5=8F=8A=E6=8E=A9=E7=A0=81=E6=A0=A1=E9=AA=8C=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=BE=97=E5=A1=AB=E5=86=99=E4=BB=A5'0'=E5=BC=80=E5=A4=B4?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E9=95=BF=E5=BA=A6=E5=A4=A7=E4=BA=8E1?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/specific/SpecificServiceCfg.java    |  4 ++--
 .../WEB-INF/views/basics/serviceDictList.jsp   | 16 ++++++++--------
 .../WEB-INF/views/basics/sysDictList.jsp       | 16 ++++++++--------
 .../specific/specificServiceHostCfgForm.jsp    | 18 ++++++++++++++++++
 .../specific/specificServiceHostCfgList.jsp    | 18 +++++++++---------
 5 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java b/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java
index fe5101587..a20649561 100644
--- a/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java
+++ b/src/main/java/com/nis/domain/specific/SpecificServiceCfg.java
@@ -101,10 +101,10 @@ public class SpecificServiceCfg extends BaseEntity<SpecificServiceCfg>{
 	
 		for(int i=0;i<allList.size();i++){
 			SpecificServiceCfg ss = allList.get(i);
-			System.out.println("处理"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId()+"条件》》"+parentId);
+			//System.out.println("处理"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId()+"条件》》"+parentId);
 			if(ss!=null&&ss.getParent()!=null&&ss.getParent().getSpecServiceId()!=null&&ss.getParent().getSpecServiceId().equals(parentId)){
 				list.add(ss);
-				System.out.println("list加入"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId());
+				//System.out.println("list加入"+ss.getSpecServiceName()+"id:"+ss.getSpecServiceId()+"父ID:"+ss.getParent().getSpecServiceId());
 				if(cascade){
 					for(int j=0;j<allList.size();j++){
 						SpecificServiceCfg child = allList.get(j);
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
index beef230f6..03c6d3d29 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
@@ -162,7 +162,7 @@
 	                               
 	                                <div class="pull-left">
 	                               		 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-										 <button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+										 <button type="button" class="btn btn-default" onClick="resetx()" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 
@@ -193,7 +193,7 @@
 										<div class="form-group">
                                             <label><spring:message code="create_time"/>：</label>
                                             <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" data-options="buttons:buttons"
-												value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+												value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                                           
                                         </div>
 			
@@ -204,7 +204,7 @@
 										<div class="form-group">
                                             <label>&nbsp;</label>
                                             <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-												value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+												value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                                           
                                         </div>
 			
@@ -216,7 +216,7 @@
 										<div class="form-group">
                                             <label><spring:message code="edit_time"/>：</label>
                                             <input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                                         </div>
 			
 									</div>
@@ -226,7 +226,7 @@
 										<div class="form-group">
                                             <label>&nbsp;</label>
                                             <input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                                           
                                         </div>
 			
@@ -269,7 +269,7 @@
 								   <th class="sort-column create_time"><spring:message code="create_time"/>
 								   </th><th><spring:message code="editor"/></th>
 								   <th class="sort-column edit_time"><spring:message code="edit_time"/></th>
-								   <shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission>
+								   <%-- <shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission> --%>
 								</tr>
 							</thead>
 							<tbody>
@@ -290,7 +290,7 @@
 												    ${fns:getUserById(serviceDictInfo.serviceDictEditor.id).name}
 												    </c:if></td>
 												<td><fmt:formatDate value="${serviceDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-												<td>
+												<%-- <td>
 													<div class="btn-group btn-xs">
 													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
@@ -304,7 +304,7 @@
 													    
 													      </ul>
 													    </div>
-													</td>
+													</td> --%>
 											</tr>
 										</c:forEach>
 							</tbody>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index ca5cc8f6d..e0c1ae6a3 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -164,7 +164,7 @@
 	                               
 	                                <div class="pull-left">
 	                               		 <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-										 <button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+										 <button type="button" class="btn btn-default" onClick="resetx()" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 	                                     <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message>  <i class="fa fa-angle-double-down"></i></button>
 									</div>
 
@@ -195,7 +195,7 @@
 										<div class="form-group">
                                             <label><spring:message code="create_time"/>：</label>
                                             <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" data-options="buttons:buttons"
-												value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+												value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                                           
                                         </div>
 			
@@ -206,7 +206,7 @@
 										<div class="form-group">
                                             <label>&nbsp;</label>
                                             <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-												value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+												value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                                           
                                         </div>
 			
@@ -218,7 +218,7 @@
 										<div class="form-group">
                                             <label><spring:message code="edit_time"/>：</label>
                                             <input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                                         </div>
 			
 									</div>
@@ -228,7 +228,7 @@
 										<div class="form-group">
                                             <label>&nbsp;</label>
                                             <input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
                                           
                                         </div>
 			
@@ -271,7 +271,7 @@
 								   <th class="sort-column create_time"><spring:message code="create_time"/>
 								   </th><th><spring:message code="editor"/></th>
 								   <th class="sort-column edit_time"><spring:message code="edit_time"/></th>
-								   <shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission>
+								   <%-- <shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission> --%>
 								</tr>
 							</thead>
 							<tbody>
@@ -294,7 +294,7 @@
 												    ${fns:getUserById(sysDictInfo.sysDictEditor.id).name}
 												    </c:if></td>
 												<td><fmt:formatDate value="${sysDictInfo.editTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-												<td>
+												<%-- <td>
 													<div class="btn-group btn-xs">
 													    <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"/><span class="caret"></span></a>
 													      <ul class="dropdown-menu btn-xs">
@@ -308,7 +308,7 @@
 													    
 													      </ul>
 													    </div>
-													</td>
+													</td> --%>
 											</tr>
 										</c:forEach>
 							</tbody>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
index 34ef50216..a73565778 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
@@ -72,6 +72,16 @@ function sjfdsj(){
 						}else{return (obj > 0) && ((obj & (obj - 1)) == 0)};
 					}
 						}, "请填写正确的IP地址掩码");
+				//掩码校验，超过两位不得以0开头
+				   jQuery.validator.addMethod("notStartZero",function(value, element) {
+						if(value.length>1){
+							var str = value.substr(0,1);
+							if(str == '0'){
+								return false;
+								}
+							}
+						 return true;
+						}, "请填写正确的数值");	
 				$("#name").focus();
 				$("#inputForm")
 						.validate(
@@ -101,22 +111,26 @@ function sjfdsj(){
 										srcPort:{
 											required:true,
 											digits:true,
+											notStartZero:true,
 											max: 65535,
 											min: 0
 									        },
 										dstPort:{
 											required:true,
 											digits:true,
+											notStartZero:true,
 											max: 65535,
 											min: 0
 										    },
 										srcPortMask:{
 											digits:true,
+											notStartZero:true,
 											max: 65535,
 											min: 0
 										    },
 										dstPortMask:{
 											digits:true,
+											notStartZero:true,
 											max: 65535,
 											min: 0
 										    }
@@ -146,22 +160,26 @@ function sjfdsj(){
 										srcPort:{
 											required:'<spring:message code="required"/>',
 											digits:'请填写整数',
+											notStartZero:'请填写正确的数值',
 											max: '数值不得大于65535',
 											min: '数值不得小于0'
 									        },
 										dstPort:{
 											required:'<spring:message code="required"/>',
 											digits:'请填写整数',
+											notStartZero:'请填写正确的数值',
 											max: '数值不得大于65535',
 											min: '数值不得小于0'
 										    },
 										srcPortMask:{
 											digits:'请填写整数',
+											notStartZero:'请填写正确的数值',
 											max: '数值不得大于65535',
 											min: '数值不得小于0'
 										    },
 										dstPortMask:{
 											digits:'请填写整数',
+											notStartZero:'请填写正确的数值',
 											max: '数值不得大于65535',
 											min: '数值不得小于0'
 										    }
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
index 3f11c536d..ed4c28a5d 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
@@ -128,7 +128,7 @@
 											   </c:forEach>
 										</form:select>
 								   </div> --%>
-								 <%--   <div class="pull-left">
+								   <div class="pull-left">
 									<c:set var="spec_service_id">请选择协议名称</c:set>
 									<form:select path="specServiceId" class="selectpicker select2 input-small" title="${spec_service_id}" data-live-search="true" data-live-search-placeholder="search" onchange="page()">
 										<c:forEach items="${listSpecService}" var="specService" >
@@ -150,14 +150,14 @@
 								   <div class="pull-left">
 									  <form:input path="dstIp" placeholder="请输入目的IP地址" class="form-control input-small"/>
 								   </div>
-								    <div class="pull-left">
-										<form:select path="direction" class="selectpicker select2 input-small" >
+								    <%-- <div class="pull-left">
+										<form:select path="direction" class="selectpicker select2 input-small">
 											<form:option value="">-请选择方向-</form:option>
 											   <c:forEach items="${fns:getDictList('SPEC_DIRECTION')}" var="dict">
 											      <form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
 											   </c:forEach>
 										</form:select>
-								   </div>
+								   </div> --%>
 								   <div class="pull-left" style="margin-right:0px;">
 										<form:select path="protocol" class="selectpicker select2 input-small" >
 											<form:option value="">-请选择协议-</form:option>
@@ -166,12 +166,12 @@
 											   </c:forEach>
 										</form:select>
 								   </div>
-								   <div class="pull-left">
+								  <%--  <div class="pull-left">
+								   	<button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
                                     <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
-                                 </div>
-                                  --%>
+                                 </div> --%>
                                   
-                              <div class="pull-left" >
+                             <%--  <div class="pull-left" >
 									<form:select path="protocol" class="selectpicker select2 input-small" >
 										<form:option value="">所有协议</form:option>
 										   <c:forEach items="${fns:getDictList('SPEC_PROTOCOL')}" var="dict">
@@ -205,7 +205,7 @@
                                            <input id="intype" class="form-control input-medium" type="text" value="">
                                     
                                        </div> 
-                                </div>  
+                                </div>   --%>
 								<div class="pull-left">
 									  <button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									  <button type="button" class="btn btn-default" onClick="resetx()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>