diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java index 5d990d016..417218233 100644 --- a/src/main/java/com/nis/domain/log/BaseLogEntity.java +++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java @@ -9,7 +9,7 @@ public class BaseLogEntity extends BaseEntity { protected Integer cfgId; protected String foundTime; //发现时间,timestamp protected String recvTime; //接收时间,timestamp - protected String TransProto; //协议类型,从字典LOG_PROTOCOL取值 + protected String transProto; //协议类型,从字典LOG_PROTOCOL取值 protected Integer addrType; //ip地址类型,从字典IP_TYPE取值 protected String dIp; //服务端ip地址 protected String sIp; //客户端ip地址 @@ -51,10 +51,10 @@ public class BaseLogEntity extends BaseEntity { this.cfgId = cfgId; } public String getTransProto() { - return TransProto; + return transProto; } public void setTransProto(String transProto) { - TransProto = transProto; + this.transProto = transProto; } public Integer getAddrType() { return addrType; @@ -167,7 +167,7 @@ public class BaseLogEntity extends BaseEntity { @Override public String toString() { return "BaseLogEntity [cfgId=" + cfgId + ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", TransProto=" - + TransProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort + + transProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort + ", sPort=" + sPort + ", service=" + service + ", entranceId=" + entranceId + ", deviceId=" + deviceId + ", direction=" + direction + ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList=" + addrList + ", userRegion=" + userRegion + ", functionId=" + functionId + ", action=" + action diff --git a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java index bacb3e822..f2e983f7e 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java @@ -55,7 +55,7 @@ public class PptpLogController extends BaseController { } model.addAttribute("page", page); } - } catch (JsonSyntaxException e) { + } catch (Exception e) { logger.info("PPTP日志查询失败", e); addMessage(model, e.getMessage()); }