通联日志国际化调整、检索条件添加及域名字典对应调整

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

@@ -22,6 +22,7 @@ import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.SysUser;
+import com.nis.domain.configuration.WebsiteDomainTopic;
 import com.nis.domain.log.NtcConnRecordLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.exceptions.MaatConvertException;
@@ -71,11 +72,19 @@ public class NtcConnRecordLogController extends BaseController {
 				params.put("searchClientLocate", log.getClientLocate());
 			}
 			
+			if (StringUtils.isNotBlank(log.getsSubscribeId())) {
+				params.put("searchSSubscribeId", log.getsSubscribeId());
+			}
+			if (StringUtils.isNotBlank(log.getdSubscribeId())) {
+				params.put("searchDSubscribeId", log.getdSubscribeId());
+			}
+			
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 			List<CodeResult> appList = CodeDicUtils.getCodeList("appCode");
 			List<CodeResult> protocolList = CodeDicUtils.getCodeList("protocolCode");
-			List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
+			//查询domainId
+			List<WebsiteDomainTopic> webList = appCfgService.getDomainDict(new WebsiteDomainTopic());
 
 			model.addAttribute("appList", appList);
 			model.addAttribute("protocolList", protocolList);
@@ -184,11 +193,21 @@ public class NtcConnRecordLogController extends BaseController {
 			if (StringUtils.isNotBlank(log.getClientLocate())) {
 				params.put("searchClientLocate", log.getClientLocate());
 			}
+			if (StringUtils.isNotBlank(log.getsSubscribeId())) {
+				params.put("searchSSubscribeId", log.getsSubscribeId());
+			}
+			if (StringUtils.isNotBlank(log.getdSubscribeId())) {
+				params.put("searchDSubscribeId", log.getdSubscribeId());
+			}
+			
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 			List<CodeResult> appList = CodeDicUtils.getCodeList("appCode");
 			List<CodeResult> protocolList = CodeDicUtils.getCodeList("protocolCode");
-			List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
+			//List<CodeResult> webList = CodeDicUtils.getCodeList("webCode");
+			//查询domainId
+			List<WebsiteDomainTopic> webList = appCfgService.getDomainDict(new WebsiteDomainTopic());
+			
 			model.addAttribute("appList", appList);
 			model.addAttribute("protocolList", protocolList);
 			model.addAttribute("webList", webList);
@@ -214,7 +233,7 @@ public class NtcConnRecordLogController extends BaseController {
 					l.setProtoId(getName(l.getProtoId(),protocolList,msgProp));
 				}
 				if (StringUtils.isNotBlank(l.getWebId())) {
-					l.setWebId(getName(l.getWebId(),webList,msgProp));
+					l.setWebId(getWebName(l.getWebId(),webList,msgProp));
 				}
 				if (StringUtils.isNotBlank(l.getC2sPktNum()) && StringUtils.isNotBlank(l.getS2cPktNum()) ) {
 					l.setTotalPkt(String.valueOf(Integer.valueOf(l.getC2sPktNum())+Integer.valueOf(l.getS2cPktNum())));
@@ -260,5 +279,16 @@ public class NtcConnRecordLogController extends BaseController {
 		}
 		return name;
 	}
+	
+	public  String getWebName(String id,List<WebsiteDomainTopic> list,Properties msgProp){
+		String name=String.valueOf(id);
+		for (int i = 0; i < list.size(); i++) {
+			if(String.valueOf(id).equals(list.get(i).getId())){
+				name=msgProp.getProperty(list.get(i).getDomain(),list.get(i).getDomain());
+				break;
+			}
+		}
+		return name;
+	}
 
 }

src/main/resources/messages/message_en.properties

@@ -1132,7 +1132,7 @@ report_total=Total
 message_type=Message Type  
 as=AS
 route=Route
-transport_layer_protocol=Protocol
+transport_layer_protocol=Trans Protocol
 av_voip_monit=VoIP Monitor
 av_voip_reject=VoIP Block
 label_proto_source=Protocol Source
@@ -1361,7 +1361,7 @@ nas_ip=NAS IP Address
 framed_ip=Framed IP Address
 log_user_name=User Name
 av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P.
-asn_ip_group_delete=\uff08IP configuration under this ASN group will also be deleted.)
+asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.)
 keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration.
 conn_record=Connection Records
 bps=Gbps
@@ -1457,4 +1457,4 @@ country_code=Country Code
 asn_name=ASN Name
 details=Details
 NTC_ASN_NUMBER=ASN
-application_layer_protocol=AppProto
+application_layer_protocol=Protocol

src/main/resources/messages/message_ru.properties

@@ -1132,7 +1132,7 @@ report_total=\u0412\u0441\u0435\u0433\u043e
 message_type=\u0422\u0438\u043f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f
 as=\u041a\u0410\u041a
 route=\u041c\u0430\u0440\u0448\u0440\u0443\u0442
-transport_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b
+transport_layer_protocol=\u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u0422\u0440\u0430\u043D\u0441\u043F\u043E\u0440\u0442\u043D\u043E\u0433\u043E \u0423\u0440\u043E\u0432\u043D\u044F
 av_voip_monit=\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433 VoIP
 av_voip_reject=VoIP \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
 label_proto_source=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430
@@ -1461,4 +1461,4 @@ country_code=Country Code
 asn_name=ASN Name
 details=Details
 NTC_ASN_NUMBER=ASN
-application_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b \u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
+application_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b

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

@@ -128,8 +128,7 @@
 						<input id="protos"  type="hidden" value="${log.protoId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
-						<sys:tableSort id="orderBy" name="orderBy.
+						<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();" />
-						" value="${page.orderBy}" callback="page();" />
 						<!-- 搜索内容与操作按钮栏 -->
 						<div class="col-md-12">
 						<%-- 	<div class="pull-left">
@@ -288,7 +287,7 @@
                                 		<label class="control-label"><spring:message code='Web'/>：</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"/>">
 											<c:forEach items="${webList}" var="web" >
-												<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
+												<option value="${web.id}"><spring:message code="${web.domain}"></spring:message></option>
 											</c:forEach>
 										</select> 
 									</div>
@@ -323,6 +322,20 @@
 										<input name="dAsn" type="text" class="form-control" value="${log.dAsn }"/>
 									</div>
 								</div>
+								
+								<div class="col-md-4">
+									<div class="form-group">
+										<label><spring:message code="s_subscribe_id"></spring:message>：</label>
+										<input name="sSubscribeId" type="text" class="form-control" value="${log.sSubscribeId }"/>
+									</div>
+								</div>
+								
+								<div class="col-md-4">
+									<div class="form-group">
+										<label><spring:message code="d_subscribe_id"></spring:message>：</label>
+										<input name="dSubscribeId" type="text" class="form-control" value="${log.dSubscribeId }"/>
+									</div>
+								</div>
 
 						</div>
 						</div>
@@ -424,8 +437,8 @@
 									<td>
 										<c:set var="webIds">${log.webId }</c:set>
 										<c:forEach items="${webList}" var="dict">
-											<c:if test="${dict.code eq log.webId}">
+											<c:if test="${dict.id eq log.webId}">
-												<c:set var="webIds">${dict.item}</c:set>
+												<c:set var="webIds">${dict.domain}</c:set>
 											</c:if>
 										</c:forEach>
 										<spring:message code="${webIds}"/>