Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

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

@@ -19,6 +19,9 @@ public class DkBehaviorLog  extends BaseLogEntity<DkBehaviorLog> {
 	protected Integer labelBsId; //浏览器id
 	protected Integer labelBehavId; //行为id
 	protected Integer labelAppId; //应用id
+	protected Integer labelProtoSource; //应用id
+	protected Integer labelBehavSource; //应用id
+	protected Integer labelAppSource; //应用id
 	
     @ApiModelProperty(value = "c2s包数", required = true)
     protected String c2sPktNum;
@@ -84,6 +87,25 @@ public class DkBehaviorLog  extends BaseLogEntity<DkBehaviorLog> {
 	public void setS2cByteNum(String s2cByteNum) {
 		this.s2cByteNum = s2cByteNum;
 	}
+	public Integer getLabelAppSource() {
+		return labelAppSource;
+	}
+	public void setLabelAppSource(Integer labelAppSource) {
+		this.labelAppSource = labelAppSource;
+	}
+	public Integer getLabelProtoSource() {
+		return labelProtoSource;
+	}
+	
+	public void setLabelProtoSource(Integer labelProtoSource) {
+		this.labelProtoSource = labelProtoSource;
+	}
+	public Integer getLabelBehavSource() {
+		return labelBehavSource;
+	}
+	public void setLabelBehavSource(Integer labelBehavSource) {
+		this.labelBehavSource = labelBehavSource;
+	}
  
     
 }

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

@@ -4,7 +4,7 @@ public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
 
 	private static final long serialVersionUID = 4597407682545926823L;
 	private Integer type;
-	private String as;
+	private String asNum;
 	private String route;
 	public Integer getType() {
 		return type;
@@ -12,11 +12,11 @@ public class NtcBGPLog extends BaseLogEntity<NtcBGPLog> {
 	public void setType(Integer type) {
 		this.type = type;
 	}
-	public String getAs() {
-		return as;
+	public String getAsNum() {
+		return asNum;
 	}
-	public void setAs(String as) {
-		this.as = as;
+	public void setAsNum(String asNum) {
+		this.asNum = asNum;
 	}
 	public String getRoute() {
 		return route;

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

@@ -0,0 +1,27 @@
+package com.nis.domain.log;
+
+/**
+ * @ClassName:NtcStreamMediaLog
+ * @Description:TODO(这里用一句话描述这个类的作用)
+ * @author (wx)
+ * @date 2018年7月16日 下午3:11:42
+ * @version V1.0
+ */
+public class NtcStreamMediaLog  extends BaseLogEntity<NtcStreamMediaLog> {
+
+	private static final long serialVersionUID = 1446933545638550170L;
+	protected String url;
+	protected String protocol;
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(String protocol) {
+		this.protocol = protocol;
+	}
+}

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

@@ -20,7 +20,7 @@ import com.google.gson.reflect.TypeToken;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
-import com.nis.domain.log.MmAvUrlLog;
+import com.nis.domain.log.NtcStreamMediaLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
@@ -42,11 +42,11 @@ public class MmAvUrlLogController extends BaseController{
 	 * @throws IOException
 	 */
 	@RequestMapping(value={"list",""})
-	public String list(Model model,@ModelAttribute("log")MmAvUrlLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
+	public String list(Model model,@ModelAttribute("log")NtcStreamMediaLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
 		
 		try {
 			
-			PageLog<MmAvUrlLog> page = new PageLog<MmAvUrlLog>(request, response);
+			PageLog<NtcStreamMediaLog> page = new PageLog<NtcStreamMediaLog>(request, response);
 			Map<String, Object> params=new HashMap<>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
@@ -62,13 +62,13 @@ public class MmAvUrlLogController extends BaseController{
 			
 			Gson gson = new GsonBuilder().create();
 			//gson泛型支持
-			LogRecvData<MmAvUrlLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<MmAvUrlLog>>(){}.getType());
+			LogRecvData<NtcStreamMediaLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcStreamMediaLog>>(){}.getType());
 			
 			if (fromJson.getStatus().intValue() == 200) {
-				Page<MmAvUrlLog> data = fromJson.getData();
+				Page<NtcStreamMediaLog> data = fromJson.getData();
 				page.setList(data.getList());
-				List<MmAvUrlLog> list = page.getList();
-				for (MmAvUrlLog l : list) {
+				List<NtcStreamMediaLog> list = page.getList();
+				for (NtcStreamMediaLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
 					setLogAction(l,serviceList);
 				}
@@ -79,7 +79,7 @@ public class MmAvUrlLogController extends BaseController{
 			logger.error("查询音视频url日志失败", e);
 			addMessageLog(model, e.getMessage());
 		}
-		return "/log/ntc/mmAvUrlList";
+		return "/log/ntc/ntcStreamMedia";
 	}
 	
 }