From c0325878e542dcb2d51f6109d802f8724156d9d5 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Fri, 26 Oct 2018 16:54:33 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8E=9F=E5=A7=8B=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0encap=5Ftype,=20link=5Fid,?= =?UTF-8?q?=20inner=5Fsmac,=20inner=5Fdmac=E5=AD=97=E6=AE=B5=EF=BC=9B=202?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=AD=A3NTC=E5=85=B3=E9=94=AE=E5=AD=97?= =?UTF-8?q?=E8=BD=ACURL=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3bean=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/LogEntity.java | 43 ++++++ .../restful/NtcLogSearchController.java | 12 +- .../java/com/nis/web/dao/DfLogSearchDao.xml | 144 ++++++++++++++++++ 3 files changed, 193 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/domain/LogEntity.java b/src/main/java/com/nis/domain/LogEntity.java index 157d6f8..64d3860 100644 --- a/src/main/java/com/nis/domain/LogEntity.java +++ b/src/main/java/com/nis/domain/LogEntity.java @@ -89,6 +89,16 @@ public abstract class LogEntity implements Serializable { @ApiModelProperty(value = "现场日志文件地址", required = true) protected String sceneFile; + @ApiModelProperty(value = "串联设备链路号", required = true) + protected Long linkId; + @ApiModelProperty(value = "原始二层封装格式", required = true) + protected Integer encapType; + @ApiModelProperty(value = "MAC_IN_MAC的内层源MAC", required = true) + protected String innerSmac; + @ApiModelProperty(value = "MAC_IN_MAC的内层目标MAC", required = true) + protected String innerDmac; + + protected String searchCfgId;//配置id protected String searchTransProto;//协议类型 protected String searchDIp;//服务端ip地址 @@ -521,5 +531,38 @@ public abstract class LogEntity implements Serializable { public String getSceneFile() { return sceneFile; } + + public Long getLinkId() { + return linkId; + } + + public void setLinkId(Long linkId) { + this.linkId = linkId; + } + + public Integer getEncapType() { + return encapType; + } + + public void setEncapType(Integer encapType) { + this.encapType = encapType; + } + + 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; + } + } diff --git a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java index ba8a027..5ea2145 100644 --- a/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java +++ b/src/main/java/com/nis/web/controller/restful/NtcLogSearchController.java @@ -1087,23 +1087,23 @@ public class NtcLogSearchController extends BaseRestController { AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, null); - Page logPage = null; + Page logPage = null; try { resetTime(ntcKeywordsUrlLog); ntcLogService.queryConditionCheck(auditLogThread, start, ntcKeywordsUrlLog, NtcKeywordsUrlLog.class, page); - logPage = new Page(); + logPage = new Page(); logPage.setPageNo(page.getPageNo()); logPage.setPageSize(page.getPageSize()); String orderBy = ""; if (null != page.getOrderBy() && !page.getOrderBy().equals("")) { - orderBy = Page.getOrderBySql(NtcStreamingMediaLog.class.getSimpleName(), page.getOrderBy()); + orderBy = Page.getOrderBySql(NtcKeywordsUrlLog.class.getSimpleName(), page.getOrderBy()); } else { orderBy = "found_Time"; } String sql = HiveSqlService.getSql(page, ntcKeywordsUrlLog, getTableName(NtcKeywordsUrlLog.class.getSimpleName() + "HiveTable", "NTC_KEYWORDS_URL_LOG"), getCol2Col(), orderBy, null); - Map> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcStreamingMediaLog.class, "foundTime", + Map> tableMapping = new LogJDBCByDruid().tableMapping(page, null, sql, NtcKeywordsUrlLog.class, "foundTime", "recvTime"); if (tableMapping == null) { logPage.setList(new ArrayList()); @@ -1111,8 +1111,8 @@ public class NtcLogSearchController extends BaseRestController { List list = tableMapping.get("obj"); if (list.size() > 0) { String jsonString = JsonMapper.toJsonString(list); - List List = (java.util.List) JsonMapper.fromJsonList(jsonString, - NtcStreamingMediaLog.class); + List List = (java.util.List) JsonMapper.fromJsonList(jsonString, + NtcKeywordsUrlLog.class); logPage.setList(List); logPage.setCount(List.size()); diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml index 06947fb..b0fcf26 100644 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml @@ -46,6 +46,10 @@ + + + + @@ -73,6 +77,10 @@ + + + + @@ -112,6 +120,10 @@ + + + + @@ -153,6 +165,10 @@ + + + + @@ -189,6 +205,10 @@ + + + + @@ -223,6 +243,10 @@ + + + + @@ -255,6 +279,10 @@ + + + + @@ -286,6 +314,10 @@ + + + + @@ -319,6 +351,10 @@ + + + + @@ -350,6 +386,10 @@ + + + + @@ -384,6 +424,10 @@ + + + + @@ -414,6 +458,10 @@ + + + + @@ -448,6 +496,10 @@ + + + + @@ -483,6 +535,10 @@ + + + + @@ -519,6 +575,10 @@ + + + + @@ -553,6 +613,10 @@ + + + + @@ -587,6 +651,10 @@ + + + + @@ -621,6 +689,10 @@ + + + + @@ -656,6 +728,10 @@ + + + + @@ -697,6 +773,10 @@ + + + + @@ -739,6 +819,10 @@ + + + + @@ -774,6 +858,10 @@ + + + + @@ -808,6 +896,10 @@ + + + + @@ -842,6 +934,10 @@ + + + + @@ -876,6 +972,10 @@ + + + + @@ -911,6 +1011,10 @@ + + + + @@ -952,6 +1056,10 @@ + + + + @@ -993,6 +1101,10 @@ + + + + @@ -1023,6 +1135,10 @@ + + + + @@ -1054,6 +1170,10 @@ + + + + @@ -1088,6 +1208,10 @@ + + + + @@ -1122,6 +1246,10 @@ + + + + @@ -1156,6 +1284,10 @@ + + + + @@ -1190,6 +1322,10 @@ + + + + @@ -1220,6 +1356,10 @@ + + + + @@ -1254,6 +1394,10 @@ + + + +