diff --git a/src/main/java/com/nis/domain/log/NtcP2pLog.java b/src/main/java/com/nis/domain/log/NtcP2pLog.java new file mode 100644 index 000000000..1529e6009 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcP2pLog.java @@ -0,0 +1,31 @@ +package com.nis.domain.log; + +public class NtcP2pLog extends BaseLogEntity{ + + /** + * + */ + private static final long serialVersionUID = -826089417186930465L; + private Integer p2pProtoId; + private Integer p2pFileId; + private String p2pKeyword; + + public Integer getP2pProtoId() { + return p2pProtoId; + } + public void setP2pProtoId(Integer p2pProtoId) { + this.p2pProtoId = p2pProtoId; + } + public Integer getP2pFileId() { + return p2pFileId; + } + public void setP2pFileId(Integer p2pFileId) { + this.p2pFileId = p2pFileId; + } + public String getP2pKeyword() { + return p2pKeyword; + } + public void setP2pKeyword(String p2pKeyword) { + this.p2pKeyword = p2pKeyword; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java index 8a26e34f0..c4efc33f9 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java @@ -17,7 +17,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.PageLog; -import com.nis.domain.log.NtcIpLog; +import com.nis.domain.log.NtcP2pLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -29,9 +29,9 @@ import com.nis.web.controller.BaseController; public class P2pLogController extends BaseController { @RequestMapping(value = {"list", ""}) - public String list(@ModelAttribute("log") NtcIpLog log, Model model, HttpServletRequest request, HttpServletResponse response) { + public String list(@ModelAttribute("log") NtcP2pLog log, Model model, HttpServletRequest request, HttpServletResponse response) { try { - PageLog page = new PageLog(request, response); + PageLog page = new PageLog(request, response); Map params = new HashMap(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); @@ -45,11 +45,11 @@ public class P2pLogController extends BaseController { logger.info("查询结果:" + recv); if (StringUtils.isNotBlank(recv)) { Gson gson = new GsonBuilder().create(); - LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); + LogRecvData fromJson = gson.fromJson(recv, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { page.setList(fromJson.getData().getList()); - List list = page.getList(); - for (NtcIpLog l : list) { + List list = page.getList(); + for (NtcP2pLog l : list) { l.setFunctionId(log.getFunctionId()); setLogAction(l,serviceList); }