Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

src/main/java/com/nis/domain/log/NtcConnRecordLog.java

@@ -28,6 +28,17 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
 	@ExcelField(title = "Total Byte", sort = 49)
 	protected String totalByte;
 	
+	protected String ispCode;//运营商
+	
+
+	
+	public String getIspCode() {
+		return ispCode;
+	}
+
+	public void setIspCode(String ispCode) {
+		this.ispCode = ispCode;
+	}
 
 	public String getTotalPkt() {
 		return totalPkt;

src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java

@@ -98,8 +98,9 @@ public class NtcConnRecordLogController extends BaseController {
 			if (StringUtils.isNotBlank(log.getdSubscribeId())) {
 				params.put("searchDSubscribeId", log.getdSubscribeId());
 			}
-			
+			if (StringUtils.isNotBlank(log.getIspCode())) {
-
+				params.put("searchIspCode", log.getIspCode());
+			}
 			model.addAttribute("appList", appList);
 			model.addAttribute("protocolList", protocolList);
 			model.addAttribute("webList", webList);
@@ -240,9 +241,9 @@ public class NtcConnRecordLogController extends BaseController {
 			if (StringUtils.isNotBlank(log.getdSubscribeId())) {
 				params.put("searchDSubscribeId", log.getdSubscribeId());
 			}
-			
+			if (StringUtils.isNotBlank(log.getIspCode())) {
-			
+				params.put("searchIspCode", log.getIspCode());
-			
+			}
 			model.addAttribute("appList", appList);
 			model.addAttribute("protocolList", protocolList);
 			model.addAttribute("webList", webList);

src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp

@@ -44,6 +44,16 @@
             $('#appSelect').selectpicker('render');
 		}
         
+        $('#ispSelect').selectpicker();
+        var app = $("#isps").val();		//回选的数据
+        if (app !=null && app  !='') {
+            var seasonlist = app.split(",");
+            $('#ispSelect').selectpicker('val',seasonlist);
+            $('#ispSelect').selectpicker('render');
+		}
+        
+        
+        
         $('#protoSelect').selectpicker();
         var proto = $("#protos").val();		//回选的数据
         if (proto !=null && proto  !='') {
@@ -127,6 +137,7 @@
 						<input id="apps"  type="hidden" value="${log.appId}"/>
 						<input id="webs"  type="hidden" value="${log.webId}"/>
 						<input id="protos"  type="hidden" value="${log.protoId}"/>
+						<input id="isps"  type="hidden" value="${log.ispCode}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<sys:tableSort id="orderBy" name="orderBy.
@@ -262,11 +273,22 @@
 							</div> --%>
 							
 							<div class="row">
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='isp'/>：</label>
+										<select id="ispSelect" name="ispCode" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
+											<c:forEach items="${fns:getIspDicList('ispCode')}" var="isp" >
+												<option value="${isp.ispKeyCode}"><spring:message code="${isp.ispKeyName}"></spring:message></option>
+											</c:forEach>
+										</select>
+									</div>
+                                </div>
+							
+							
                                 <div class="col-md-2">
 									<div class="form-group">
                                 		<label class="control-label"><spring:message code='APP'/>：</label>
 										<select id="appSelect" name="appId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
-											<option value="" disabled="true"><spring:message code="select"/></option>
 											<c:forEach items="${appList}" var="app" >
 												<option value="${app.code}"><spring:message code="${app.item}"></spring:message></option>
 											</c:forEach>
@@ -278,7 +300,6 @@
 									<div class="form-group">
                                 		<label class="control-label"><spring:message code='application_layer_protocol'/>：</label>
 										<select id="protoSelect" name="protoId" title="<spring:message code="select"/>" class="selectpicker form-control " data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
-											<option value="" disabled="true"><spring:message code="select"/></option>
 											<c:forEach items="${protocolList}" var="proto" >
 												<option value="${proto.code}"><spring:message code="${proto.item}"></spring:message></option>
 											</c:forEach>
@@ -290,7 +311,6 @@
 									<div class="form-group">
                                 		<label class="control-label"><spring:message code="domain_name"/>：</label>
 										<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple  data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
-											<option value="" disabled="true"><spring:message code="select"/></option>
 											<c:forEach items="${webList}" var="web" >
 												<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
 											</c:forEach>
@@ -312,15 +332,14 @@
 									</div>
 								</div>
                                 
+							</div>
+							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="s_asn"></spring:message>：</label>
 										<input name="sAsn" type="text" class="form-control" value="${log.sAsn }"/>
 									</div>
 								</div>
-								
-							</div>
-							<div class="row">
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="d_asn"></spring:message>：</label>