1、http-url添加加日志总量

2、日志添加“是否缺省显示”列
3、service_name对应的国际化优化

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

@@ -43,7 +43,38 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 	protected String isLogTotalSearch;//由配置列表点击日志总量进行查询的标识
 	protected String orderBy;//排序参数
 	
+	//新增字段
+	protected Integer encapType;//原始二层封装格式
+	protected Integer linkId;//串联设备链路号
+	protected String innerSmac;//MAC_IN_MAC的内层源MAC
+	protected String innerDmac;//MAC_IN_MAC的内层目标MAC
 	
+	
+	
+	public Integer getEncapType() {
+		return encapType;
+	}
+	public void setEncapType(Integer encapType) {
+		this.encapType = encapType;
+	}
+	public Integer getLinkId() {
+		return linkId;
+	}
+	public void setLinkId(Integer linkId) {
+		this.linkId = linkId;
+	}
+	public String getInnerSmac() {
+		return innerSmac;
+	}
+	public void setInnerSmac(String innerSmac) {
+		this.innerSmac = innerSmac;
+	}
+	public String getInnerDmac() {
+		return innerDmac;
+	}
+	public void setInnerDmac(String innerDmac) {
+		this.innerDmac = innerDmac;
+	}
 	public String getOrderBy() {
 		return orderBy;
 	}

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

@@ -6,6 +6,53 @@ public class NtcAppLog extends BaseLogEntity<NtcAppLog> {
 	 * 
 	 */
 	private static final long serialVersionUID = 6025543701060412591L;
+	
+	protected Integer labelProtoId; //协议类型id
+	protected Integer labelProtoSource; //应用id
+	protected Integer labelBehavId; //行为id
+	protected Integer labelBehavSource; 
+	protected Integer labelAppId; 
+	protected Integer labelAppSource; 
+	
+	
+	public Integer getLabelProtoId() {
+		return labelProtoId;
+	}
+	public void setLabelProtoId(Integer labelProtoId) {
+		this.labelProtoId = labelProtoId;
+	}
+	public Integer getLabelProtoSource() {
+		return labelProtoSource;
+	}
+	public void setLabelProtoSource(Integer labelProtoSource) {
+		this.labelProtoSource = labelProtoSource;
+	}
+	public Integer getLabelBehavId() {
+		return labelBehavId;
+	}
+	public void setLabelBehavId(Integer labelBehavId) {
+		this.labelBehavId = labelBehavId;
+	}
+	public Integer getLabelBehavSource() {
+		return labelBehavSource;
+	}
+	public void setLabelBehavSource(Integer labelBehavSource) {
+		this.labelBehavSource = labelBehavSource;
+	}
+	public Integer getLabelAppId() {
+		return labelAppId;
+	}
+	public void setLabelAppId(Integer labelAppId) {
+		this.labelAppId = labelAppId;
+	}
+	public Integer getLabelAppSource() {
+		return labelAppSource;
+	}
+	public void setLabelAppSource(Integer labelAppSource) {
+		this.labelAppSource = labelAppSource;
+	}
+	
+	
 
 
 }

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

@@ -23,10 +23,12 @@ import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcAppLog;
 import com.nis.domain.maat.LogRecvData;
+import com.nis.util.CodeDicUtils;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
+import com.nis.web.dao.dashboard.codedic.CodeResult;
 
 @Controller
 @RequestMapping(value = "${adminPath}/log/ntc/ntcAppLogs")
@@ -52,10 +54,19 @@ public class AppLogController extends BaseController{
 			params.put("pageNo", page.getPageNo());
 			//查询值判断
 			initLogSearchValue(entry,params);
-			
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
 			
+			//获取字典信息
+			List<CodeResult> protocolList=CodeDicUtils.getCodeList("protocolCode");
+			List<CodeResult> osList=CodeDicUtils.getCodeList("osCode");
+			List<CodeResult> browserList=CodeDicUtils.getCodeList("browserCode");
+			List<CodeResult> behaviorList=CodeDicUtils.getCodeList("behaviorCode");
+			List<CodeResult> appList=CodeDicUtils.getCodeList("appCode");
+			model.addAttribute("protocolList", protocolList);
+			model.addAttribute("behaviorList", behaviorList);
+			model.addAttribute("appList", appList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_APP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);