Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

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

@@ -40,6 +40,8 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss
 	protected String searchFoundEndTime;//结束时间，格式同上
 	
+	protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识
+	
 	public String getFoundTime() {
 		return foundTime;
 	}
@@ -220,27 +222,24 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	public void setDate(String date) {
 		this.date = date;
 	}
+	public String getIsLogTotalSearch() {
+		return isLogTotalSearch;
+	}
+	public void setIsLogTotalSearch(String isLogTotalSearch) {
+		this.isLogTotalSearch = isLogTotalSearch;
+	}
 	@Override
 	public String toString() {
-		return "{\"cfgId\"=\"" + cfgId + "\", \"foundTime\"=\"" + foundTime
+		return "BaseLogEntity [cfgId=" + cfgId + ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", transProto="
-				+ "\", \"recvTime\"=\"" + recvTime + "\", \"transProto\"=\""
+				+ transProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort
-				+ transProto + "\", \"addrType\"=\"" + addrType
+				+ ", sPort=" + sPort + ", service=" + service + ", entranceId=" + entranceId + ", deviceId=" + deviceId
-				+ "\", \"dIp\"=\"" + dIp + "\", \"sIp\"=\"" + sIp
+				+ ", direction=" + direction + ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList="
-				+ "\", \"dPort\"=\"" + dPort + "\", \"sPort\"=\"" + sPort
+				+ addrList + ", serverLocate=" + serverLocate + ", clientLocate=" + clientLocate + ", userRegion="
-				+ "\", \"service\"=\"" + service + "\", \"entranceId\"=\""
+				+ userRegion + ", sAsn=" + sAsn + ", dAsn=" + dAsn + ", sSubscribeId=" + sSubscribeId
-				+ entranceId + "\", \"deviceId\"=\"" + deviceId
+				+ ", dSubscribeId=" + dSubscribeId + ", sceneFile=" + sceneFile + ", functionId=" + functionId
-				+ "\", \"direction\"=\"" + direction + "\", \"streamDir\"=\""
+				+ ", action=" + action + ", date=" + date + ", seltype=" + seltype + ", searchFoundStartTime="
-				+ streamDir + "\", \"capIp\"=\"" + capIp
+				+ searchFoundStartTime + ", searchFoundEndTime=" + searchFoundEndTime + ", isLogTotalSearch="
-				+ "\", \"addrList\"=\"" + addrList + "\", \"serverLocate\"=\""
+				+ isLogTotalSearch + "]";
-				+ serverLocate + "\", \"clientLocate\"=\"" + clientLocate
-				+ "\", \"userRegion\"=\"" + userRegion + "\", \"sAsn\"=\""
-				+ sAsn + "\", \"dAsn\"=\"" + dAsn + "\", \"sSubscribeId\"=\""
-				+ sSubscribeId + "\", \"dSubscribeId\"=\"" + dSubscribeId
-				+ "\", \"sceneFile\"=\"" + sceneFile + "\", \"functionId\"=\""
-				+ functionId + "\", \"action\"=\"" + action
-				+ "\", \"seltype\"=\"" + seltype
-				+ "\", \"searchFoundStartTime\"=\"" + searchFoundStartTime
-				+ "\", \"searchFoundEndTime\"=\"" + searchFoundEndTime + "}";
 	}
 	
 	

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

@@ -6,20 +6,20 @@ public class NtcP2pLog extends BaseLogEntity<NtcP2pLog>{
 	 * 
 	 */
 	private static final long serialVersionUID = -826089417186930465L;
-	private Integer p2pProtoId;
+	private String p2pProto;
-	private Integer p2pFileId;
+	private String p2pFileId;
 	private String p2pKeyword;
 	
-	public Integer getP2pProtoId() {
+	public String getP2pProto() {
-		return p2pProtoId;
+		return p2pProto;
 	}
-	public void setP2pProtoId(Integer p2pProtoId) {
+	public void setP2pProto(String p2pProto) {
-		this.p2pProtoId = p2pProtoId;
+		this.p2pProto = p2pProto;
 	}
-	public Integer getP2pFileId() {
+	public String getP2pFileId() {
 		return p2pFileId;
 	}
-	public void setP2pFileId(Integer p2pFileId) {
+	public void setP2pFileId(String p2pFileId) {
 		this.p2pFileId = p2pFileId;
 	}
 	public String getP2pKeyword() {
@@ -28,4 +28,5 @@ public class NtcP2pLog extends BaseLogEntity<NtcP2pLog>{
 	public void setP2pKeyword(String p2pKeyword) {
 		this.p2pKeyword = p2pKeyword;
 	}
+		
 }

src/main/java/com/nis/web/controller/BaseController.java

@@ -674,7 +674,7 @@ public class BaseController {
 			params.put("searchFoundEndTime", entry.getSearchFoundEndTime());
 		}else{
 			// 判断是否是从配置界面过来的日志查询
-			if(entry.getCfgId() != null) {
+			if(StringUtils.isNotBlank(entry.getIsLogTotalSearch())) {
 				// 判断startTime是否有值
 				if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) {
 					String endTime = Constants.LOG_TIME_END;
@@ -687,7 +687,9 @@ public class BaseController {
 					entry.setSearchFoundEndTime(endTime);
 				}else {
 					Calendar startTimeCal = Calendar.getInstance();
+					if(StringUtils.isNotEmpty(entry.getDate())) {
 						startTimeCal.setTimeInMillis(Long.parseLong(entry.getDate()));// 同步日志总量查询时间
+					}
 					// 时间间隔
 					int interval = Constants.LOG_TIME_RANGE/1000/60;
 					if(interval < 60) {
@@ -702,7 +704,7 @@ public class BaseController {
 					}
 					Calendar endTimeCal = Calendar.getInstance();
 					endTimeCal.setTimeInMillis(startTimeCal.getTimeInMillis());
-					endTimeCal.add(Calendar.SECOND, -1);
+					//endTimeCal.add(Calendar.SECOND, -1);
 					
 					startTimeCal.add(Calendar.MINUTE, -interval); //开始时间减去时间间隔
 					

src/main/java/com/nis/web/controller/configuration/LogSearchController.java

@@ -15,8 +15,8 @@ import com.nis.web.controller.BaseController;
 public class LogSearchController extends BaseController{
 	
 	@RequestMapping(value = {"list",""})
-	public String LogSearch(BaseLogEntity<Object> entity, Integer compileId,RedirectAttributes attr, 
+	public String LogSearch(BaseLogEntity<Object> entity, RedirectAttributes attr, HttpServletRequest request, 
-			HttpServletRequest request, HttpServletResponse response) {
+			HttpServletResponse response) {
 		/**
 		 * url: logUrl
 		 * searchCfgId: compileId
@@ -26,10 +26,11 @@ public class LogSearchController extends BaseController{
 		String logUrl = menuService.getLogUrl(entity.getFunctionId());
 		Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());
 		
-		attr.addAttribute("cfgId", compileId);
 		attr.addAttribute("service", serviceId);
+		attr.addAttribute("cfgId", entity.getCfgId());
 		attr.addAttribute("functionId", entity.getFunctionId());
 		attr.addAttribute("date", entity.getDate());
+		attr.addAttribute("isLogTotalSearch", entity.getIsLogTotalSearch());
 		return "redirect:"+adminPath+logUrl;
 	}
 }

src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java

@@ -214,7 +214,19 @@ public class SpecificServiceCfgController extends BaseController {
 		map2.put("name","root_node");
 		//map2.put("placeholder","0");
 		mapList.add(map2);
-		if(specific==null||!specific) {
+		List<SysDataDictionaryItem> isShowList=DictUtils.getDictList("IS_SHOW_BUSINESS_TYPE");
+		boolean isShowBusinessType=false;
+		if(isShowList!=null&&isShowList.size()>0) {
+			for(SysDataDictionaryItem item:isShowList) {
+				if(item.getStatus()==1) {//可用
+					if("1".equals(item.getItemCode())) {
+						isShowBusinessType=true;
+						break;
+					}
+				}
+			}
+		}
+		if((specific==null||!specific)&&isShowBusinessType) {
 			Properties props=this.getMsgProp();
 			List<SysDataDictionaryItem>  businessTypeList=Lists.newArrayList();
 			if(cfgType==1) {

src/main/resources/messages/message_en.properties

@@ -1149,3 +1149,7 @@ preset=Preset
 ip_must_select=IP Configuration must select
 av_voip_account_reject=VoIP Account Control
 av_voip_account_monit=VoIP Account Monitoring
+
+p2p_proto=P2P Protocol
+p2p_file_id=File Marking
+p2p_keyword=Emule Search Keyword

src/main/resources/messages/message_zh_CN.properties

@@ -1147,3 +1147,7 @@ preset=\u9884\u7F6E
 ip_must_select=IP\u914D\u7F6E\u5FC5\u9009
 av_voip_account_reject=VoIP \u8D26\u53F7\u7BA1\u63A7
 av_voip_account_monit=VoIP \u8D26\u53F7\u76D1\u6D4B
+
+p2p_proto=P2P\u534F\u8BAE
+p2p_file_id=\u6587\u4EF6\u6807\u8BC6
+p2p_keyword=Emule\u641C\u7D22\u5173\u952E\u8BCD

src/main/resources/sql/20180913/add_av_sign_sample_cfg.sql

@@ -0,0 +1,3 @@
+
+-- ------视频场在数据库预置一条compileId为0数据-------------------
+INSERT INTO `av_sign_sample_cfg` VALUES ('10022', '1', '1', '0', '0', '16', '1', null, '0', '2018-09-06 15:56:53', null, null, '158', '2018-09-13 16:43:54', '266', '0', '0', '0', '0', '0', '0', '0', '33', '0', '0');

src/main/resources/sql/20180913/update_dict_IS_SHOW_BUSINESS_TYPE.sql

@@ -0,0 +1,6 @@
+#先插入字典名字
+INSERT INTO sys_data_dictionary_name (module_name,mark,remark,revision,create_time,modify_time,STATUS) VALUES ('app，基础协议是否展示业务类型','IS_SHOW_BUSINESS_TYPE','','',NOW(),NOW(),1);
+#再查询字典的id
+SELECT * FROM sys_data_dictionary_name WHERE mark='IS_SHOW_BUSINESS_TYPE';
+#添加字典值
+INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES(1,'yes_no','是否',0,1,1,113)

src/main/resources/sql/add_function_service.sql

@@ -2,3 +2,8 @@ INSERT INTO function_service_dict
    (`dict_id`, `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`)
 VALUES
    (116, 570, 0, 1, 'monit', 520, 'pxy_intercept_monit_keyring', '', 1, null, null, null, null, '');
+   
+INSERT INTO function_service_dict 
+	(`function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) 
+VALUES 
+	('510', '0', '1', 'monit', '146', 'p2p_monit', NULL, '1', NULL, NULL, NULL, NULL, '1,2,3,4');

src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp

@@ -52,6 +52,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -42,6 +42,7 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+						<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -42,6 +42,7 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+						<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -42,6 +42,7 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+						<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -42,6 +42,7 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+						<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -43,6 +43,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -47,6 +47,7 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+								<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">

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

@@ -42,6 +42,7 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+						<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -43,6 +43,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -57,6 +57,7 @@
 									value="${page.pageSize}" />
 								<input id="functionId" name="functionId" type="hidden"
 									value="${log.functionId}" />
+								<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden"
 									value="${log.isFilterAction }" />

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -43,6 +43,7 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+						<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->
@@ -187,6 +188,11 @@
 								<th><spring:message code="action"/></th>
 								<th><spring:message code="found_time"/></th>
 								<th><spring:message code="entrance"/></th>
+								
+								<th><spring:message code="p2p_proto"/></th>
+								<th><spring:message code="p2p_file_id"/></th>
+								<th><spring:message code="p2p_keyword"/></th>
+								
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>
 								<th><spring:message code='addr_type'/></th>
@@ -228,6 +234,11 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									
+									<td>${log.p2pProto}</td>
+									<td>${log.p2pFileId}</td>
+									<td>${log.p2pKeyword}</td>
+									
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>${log.transProto }</td>
 									<td>

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

@@ -47,6 +47,7 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+								<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">

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

@@ -44,6 +44,7 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+							<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -48,6 +48,7 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+								<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">

src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp

@@ -42,6 +42,7 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
+						<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

src/main/webapp/static/pages/scripts/pageLogs.js

@@ -50,8 +50,8 @@ $(document).ready(function() {
 	});
 	
 	// 添加由配置界面跳转到日志查询界面后的返回按钮
-	var cfgId = $("input[name=cfgId]").val();
+	var isLogTotalSearch = $("#isLogTotalSearch").val();
-	if(cfgId != undefined && cfgId != ''){
+	if(isLogTotalSearch != undefined && isLogTotalSearch != ''){
 		$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>"+$.validator.messages.go_back+"</button>");
 	}
 });