日志初始化设置公共查询参数

2018-06-13 15:18:50 +08:00
parent a18ddf2d46
commit a78481bda2
3 changed files with 84 additions and 66 deletions
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -45,6 +45,7 @@ import com.nis.domain.configuration.NumBoundaryCfg;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.domain.configuration.StringCfgTemplate;
 import com.nis.domain.log.BaseLogEntity;
+import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.util.Configurations;
 //import com.nis.main.ConvertTool;
 import com.nis.util.Constants;
@@ -476,4 +477,43 @@ public class BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 		model.addAttribute("serviceList", serviceList);
 	}
+	//初始化查询值判断
+	public void initLogSearchValue(BaseLogEntity entry,Map<String, Object> params){
+		
+		if (StringUtils.isNotBlank(entry.getSearchFoundStartTime())&&StringUtils.isNotBlank(entry.getSearchFoundEndTime())) {
+			params.put("searchFoundStartTime", entry.getSearchFoundStartTime());
+			params.put("searchFoundEndTime", entry.getSearchFoundEndTime());
+		}else{
+			//设置默认查询当前时间及前五分钟
+			String startTime = DateUtils.getDateTime();
+			Date dateEnd = new Date(new Date().getTime()-Constants.LOG_TIME_RANGE);
+			String endTime = DateUtils.formatDateTime(dateEnd);
+			params.put("searchFoundStartTime", startTime);
+			params.put("searchFoundEndTime",endTime );
+			entry.setSearchFoundStartTime(startTime);
+			entry.setSearchFoundEndTime(endTime);
+		}
+		
+		if (StringUtils.isNotBlank(entry.getProtocol())) {
+			params.put("searchProtocol", entry.getProtocol());
+		}
+		if (entry.getServiceType()!=null) {
+			params.put("searchServiceType", entry.getServiceType());
+		}
+		if (StringUtils.isNotBlank(entry.getServerIp())) {
+			params.put("searchServerIp", entry.getServerIp());
+		}
+		if (StringUtils.isNotBlank(entry.getClientIp())) {
+			params.put("searchClientIp", entry.getClientIp());
+		}
+		if (StringUtils.isNotBlank(entry.getCljIp())) {
+			params.put("searchCljIp", entry.getCljIp());
+		}
+		if (entry.getDirection()!=null) {
+			params.put("searchDirection", entry.getDirection());
+		}
+		if (entry.getEntranceId()!=null) {
+			params.put("searchEntranceId", entry.getEntranceId());
+		}
+	}
 }
--- a/src/main/java/com/nis/web/controller/log/ntc/OpenVpnController.java
+++ b/src/main/java/com/nis/web/controller/log/ntc/OpenVpnController.java
@@ -1,6 +1,5 @@
 package com.nis.web.controller.log.ntc;

-import java.io.File;
 import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
@@ -11,7 +10,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

 import org.apache.http.client.ClientProtocolException;
-import org.aspectj.util.FileUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -46,46 +44,16 @@ public class OpenVpnController extends BaseController{
 	public String list(Model model,@ModelAttribute("log")NtcOpenVpnLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
 		
 		try {
+			//初始化action
+			initLogServiceType(model, entry);
+			
 			Page<NtcOpenVpnLog> page = new Page<NtcOpenVpnLog>(request, response);
 			Map<String, Object> params=new HashMap<>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
+			//查询值判断
+			initLogSearchValue(entry,params);
 			
-			if (StringUtils.isNotBlank(entry.getSearchFoundStartTime())&&StringUtils.isNotBlank(entry.getSearchFoundEndTime())) {
-				params.put("searchFoundStartTime", entry.getSearchFoundStartTime());
-				params.put("searchFoundEndTime", entry.getSearchFoundEndTime());
-			}else{
-				//设置默认查询当前时间及前五分钟
-				String startTime = DateUtils.getDateTime();
-				Date dateEnd = new Date(new Date().getTime()-Constants.LOG_TIME_RANGE);
-				String endTime = DateUtils.formatDateTime(dateEnd);
-				params.put("searchFoundStartTime", startTime);
-				params.put("searchFoundEndTime",endTime );
-				entry.setSearchFoundStartTime(startTime);
-				entry.setSearchFoundEndTime(endTime);
-			}
-			
-			if (StringUtils.isNotBlank(entry.getProtocol())) {
-				params.put("searchProtocol", entry.getProtocol());
-			}
-			if (entry.getServiceType()!=null) {
-				params.put("searchServiceType", entry.getServiceType());
-			}
-			if (StringUtils.isNotBlank(entry.getServerIp())) {
-				params.put("searchServerIp", entry.getServerIp());
-			}
-			if (StringUtils.isNotBlank(entry.getClientIp())) {
-				params.put("searchClientIp", entry.getClientIp());
-			}
-			if (StringUtils.isNotBlank(entry.getCljIp())) {
-				params.put("searchCljIp", entry.getCljIp());
-			}
-			if (entry.getDirection()!=null) {
-				params.put("searchDirection", entry.getDirection());
-			}
-			if (entry.getEntranceId()!=null) {
-				params.put("searchEntranceId", entry.getEntranceId());
-			}
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_OPENVPN_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params);
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -58,14 +58,26 @@ $(document).ready(function(){
 							
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
-							   <div class="pull-left">	
-								<div class="input-group">
-                                          <div class="input-group-btn">
-											<span class="selectpicker form-control" ><spring:message code="entrance_id"/></span>
-                                          </div>
-                                          <input id="entranceId" name="entranceId" class="form-control input-small" type="text" value="${log.entranceId}"/>
-                           				</div>
-                              </div>
+							<div class="pull-left">	
+				 				  <div class="input-group">
+	                                 <div class="input-group-btn">
+	                                   <c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="protocol" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="protocol_type"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+	                                    </div></div>
+                        		</div>
+							  <div class="pull-left">
+									<form:select path="serviceType" class="selectpicker select2 input-small">
+										<form:option value=""><spring:message code="action"/></form:option>
+										<c:forEach items="${serviceList}" var="service">
+								 			<form:option value="${service.serviceId}" ><spring:message code="${service.actionCode}"/></form:option>
+					             		</c:forEach>
+									</form:select>
+								</div>
                        		<div class="pull-left">
 									<div class="input-group">
                                        <div class="input-group-btn">
@@ -78,19 +90,14 @@ $(document).ready(function(){
                                        </div>
 	                               	</div> 
 								   </div>							
-							
-								<div class="pull-left">	
-				 				  <div class="input-group">
-	                                 <div class="input-group-btn">
-	                                   <c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="protocol" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-												<form:option value=""><spring:message code="protocol_type"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-	                                    </div></div>
-                        		</div>
+								 <div class="pull-left">	
+									<div class="input-group">
+	                                          <div class="input-group-btn">
+												<span class="selectpicker form-control" ><spring:message code="entrance_id"/></span>
+	                                          </div>
+	                                          <input id="entranceId" name="entranceId" class="form-control input-small" type="text" value="${log.entranceId}"/>
+	                           				</div>
+	                              </div>
 								<div class="pull-left">
 									<div class="input-group">
                                          <div class="input-group-btn">
@@ -117,7 +124,7 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-3">
+									<div class="col-md-2">
 									<div class="form-group">
 										<label class="form-label"><spring:message code="begin_date"/>：</label>
 											<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control Wdate"
@@ -126,23 +133,23 @@ $(document).ready(function(){
 										</div>
 									</div>
 									
-									<div class="col-md-3">
+									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="end_date"/>：</label>
 											<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control Wdate"
 											value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 									</div>
 									</div>
-									<div class="col-md-3">
+									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
-											<input id="clientIp" name="clientIp" class="form-control input-hide-bg" type="text" value="${log.clientIp}"/>
+											<input id="clientIp" name="clientIp" class="form-control" type="text" value="${log.clientIp}"/>
 									</div>
 									</div>
-									<div class="col-md-3">
+									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="serverip"/>：</label>
-											<input id="serverIp" name="serverIp" class="form-control input-hide-bg" type="text" value="${log.serverIp}"/>
+											<input id="serverIp" name="serverIp" class="form-control" type="text" value="${log.serverIp}"/>
 									</div>
 									</div>
 								</div>
@@ -184,7 +191,7 @@ $(document).ready(function(){
 									<td>${log.cfgId}</td> 
 									<td>${log.entranceId}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
@@ -215,7 +222,10 @@ $(document).ready(function(){
 									<td>${log.userRegion}</td>
 									<td>${log.version}</td>
 									<td>${log.encryptMode}</td>
-									<td>${log.hmac}</td>
+									<td>
+										<c:if test="${log.hmac==0}"><spring:message code="no"/></c:if>
+										<c:if test="${log.hmac==1}"><spring:message code="yes"/></c:if>
+									</td>
 									<td>
 										<c:if test="${log.tunnelType==1}">TCP</c:if>
 										<c:if test="${log.tunnelType==2}">UDP</c:if>