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 extends BaseEntity { @@ -31,13 +36,15 @@ public class BaseLogEntity extends BaseEntity { 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 { +public class NtcIpsecLog extends BaseLogEntity { /** * 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 { +public class NtcOpenVpnLog extends BaseLogEntity { /** * 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 { +public class NtcSshLog extends BaseLogEntity { /** * 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 { - -}