From 2819ef14e2cc983945734fbe3f8a207331482176 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Mon, 11 Jun 2018 18:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=EF=BC=8C=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/log/BaseLogEntity.java   | 11 +++++++++--
 .../domain/log/{IpsecLog.java => NtcIpsecLog.java}    |  2 +-
 .../log/{OpenVpnLog.java => NtcOpenVpnLog.java}       |  2 +-
 src/main/java/com/nis/domain/log/NtcSshLog.java       |  2 +-
 src/main/java/com/nis/domain/log/VpenVpn.java         |  5 -----
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename src/main/java/com/nis/domain/log/{IpsecLog.java => NtcIpsecLog.java} (88%)
 rename src/main/java/com/nis/domain/log/{OpenVpnLog.java => NtcOpenVpnLog.java} (88%)
 delete mode 100644 src/main/java/com/nis/domain/log/VpenVpn.java

diff --git a/src/main/java/com/nis/domain/log/BaseLogEntity.java b/src/main/java/com/nis/domain/log/BaseLogEntity.java
index 5bc870dec..a8fb99cb0 100644
--- a/src/main/java/com/nis/domain/log/BaseLogEntity.java
+++ b/src/main/java/com/nis/domain/log/BaseLogEntity.java
@@ -1,6 +1,11 @@
 package com.nis.domain.log;
 
+import java.text.ParseException;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.nis.domain.BaseEntity;
+import com.nis.util.DateUtils;
 
 public class BaseLogEntity<T> extends BaseEntity<T> {
 
@@ -31,13 +36,15 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
 		this.cfgId = cfgId;
 	}
 	public String getFoundTime() {
-		return foundTime;
+		Date date = new Date(Long.parseLong(this.foundTime));
+		return DateUtils.formatDateTime(date);
 	}
 	public void setFoundTime(String foundTime) {
 		this.foundTime = foundTime;
 	}
 	public String getRecvTime() {
-		return recvTime;
+		Date date = new Date(Long.parseLong(this.recvTime));
+		return DateUtils.formatDateTime(date);
 	}
 	public void setRecvTime(String recvTime) {
 		this.recvTime = recvTime;
diff --git a/src/main/java/com/nis/domain/log/IpsecLog.java b/src/main/java/com/nis/domain/log/NtcIpsecLog.java
similarity index 88%
rename from src/main/java/com/nis/domain/log/IpsecLog.java
rename to src/main/java/com/nis/domain/log/NtcIpsecLog.java
index b7073e8b8..6eefc95f2 100644
--- a/src/main/java/com/nis/domain/log/IpsecLog.java
+++ b/src/main/java/com/nis/domain/log/NtcIpsecLog.java
@@ -1,6 +1,6 @@
 package com.nis.domain.log;
 
-public class IpsecLog extends BaseLogEntity<IpsecLog> {
+public class NtcIpsecLog extends BaseLogEntity<NtcIpsecLog> {
 
 	/**
 	 * 
diff --git a/src/main/java/com/nis/domain/log/OpenVpnLog.java b/src/main/java/com/nis/domain/log/NtcOpenVpnLog.java
similarity index 88%
rename from src/main/java/com/nis/domain/log/OpenVpnLog.java
rename to src/main/java/com/nis/domain/log/NtcOpenVpnLog.java
index 2919f3d8b..83f9c1c44 100644
--- a/src/main/java/com/nis/domain/log/OpenVpnLog.java
+++ b/src/main/java/com/nis/domain/log/NtcOpenVpnLog.java
@@ -1,6 +1,6 @@
 package com.nis.domain.log;
 
-public class OpenVpnLog extends BaseLogEntity<OpenVpnLog> {
+public class NtcOpenVpnLog extends BaseLogEntity<NtcOpenVpnLog> {
 	
 	/**
 	 * 
diff --git a/src/main/java/com/nis/domain/log/NtcSshLog.java b/src/main/java/com/nis/domain/log/NtcSshLog.java
index 1e6818c0e..af953a29c 100644
--- a/src/main/java/com/nis/domain/log/NtcSshLog.java
+++ b/src/main/java/com/nis/domain/log/NtcSshLog.java
@@ -1,6 +1,6 @@
 package com.nis.domain.log;
 
-public class NtcSshLog extends BaseLogEntity<OpenVpnLog> {
+public class NtcSshLog extends BaseLogEntity<NtcSshLog> {
 
 	/**
 	 * 
diff --git a/src/main/java/com/nis/domain/log/VpenVpn.java b/src/main/java/com/nis/domain/log/VpenVpn.java
deleted file mode 100644
index 3e5db3ae7..000000000
--- a/src/main/java/com/nis/domain/log/VpenVpn.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.nis.domain.log;
-
-public class VpenVpn {
-
-}