This commit is contained in:
insanity 2017-06-23 11:47:37 +09:00
parent 77412f30d6
commit c0dddbfdca
3 changed files with 9 additions and 11 deletions

View File

@ -1,7 +1,6 @@
package com.loafle.overflow.models; package com.loafle.overflow.module.history;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date; import java.util.Date;
/** /**
@ -9,7 +8,7 @@ import java.util.Date;
*/ */
@Entity @Entity
@Table(name = "TBL_HISTORY", schema = "public", catalog = "postgres") @Table(name = "TBL_HISTORY", schema = "public", catalog = "postgres")
public class TblHistory { public class History {
private long id; private long id;
private Date createDate; private Date createDate;
@ -38,7 +37,7 @@ public class TblHistory {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
TblHistory that = (TblHistory) o; History that = (History) o;
if (id != that.id) return false; if (id != that.id) return false;
if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;

View File

@ -1,4 +1,4 @@
package com.loafle.overflow.models; package com.loafle.overflow.module.probe.model;
import com.loafle.overflow.meta.MetaProbeTaskType; import com.loafle.overflow.meta.MetaProbeTaskType;
import com.loafle.overflow.module.probe.model.Probe; import com.loafle.overflow.module.probe.model.Probe;
@ -12,7 +12,7 @@ import java.util.Date;
*/ */
@Entity @Entity
@Table(name = "TBL_PROBE_TASK", schema = "public", catalog = "postgres") @Table(name = "TBL_PROBE_TASK", schema = "public", catalog = "postgres")
public class TblProbeTask { public class ProbeTask {
private long id; private long id;
private MetaProbeTaskType metaProbeTaskType; private MetaProbeTaskType metaProbeTaskType;
private Probe probe; private Probe probe;
@ -138,7 +138,7 @@ public class TblProbeTask {
// if (this == o) return true; // if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false; // if (o == null || getClass() != o.getClass()) return false;
// //
// TblProbeTask that = (TblProbeTask) o; // ProbeTask that = (ProbeTask) o;
// //
// if (id != that.id) return false; // if (id != that.id) return false;
// if (typeId != that.typeId) return false; // if (typeId != that.typeId) return false;

View File

@ -1,7 +1,6 @@
package com.loafle.overflow.models; package com.loafle.overflow.module.websocket;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date; import java.util.Date;
/** /**
@ -9,7 +8,7 @@ import java.util.Date;
*/ */
@Entity @Entity
@Table(name = "TBL_UI_WEBSOCKET", schema = "public", catalog = "postgres") @Table(name = "TBL_UI_WEBSOCKET", schema = "public", catalog = "postgres")
public class TblUiWebsocket { public class UiWebsocket {
private long id; private long id;
private Date createDate; private Date createDate;
@ -38,7 +37,7 @@ public class TblUiWebsocket {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
TblUiWebsocket that = (TblUiWebsocket) o; UiWebsocket that = (UiWebsocket) o;
if (id != that.id) return false; if (id != that.id) return false;
if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;