overflow_backup_2018_0455/overflow_dao
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
snoop 2017-06-22 21:15:30 +09:00
parent fc763c645e
commit 8d5815ecbb
4 changed files with 134 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/main/java/com/loafle/overflow/models/TblApiKey.java
View File

@ -1,7 +1,10 @@
package com.loafle.overflow.models;
import com.loafle.overflow.module.domain.Domain;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
/**
* Created by root on 17. 6. 22.
@ -11,11 +14,11 @@ import java.sql.Timestamp;
public class TblApiKey {
private long id;
private String apiKey;
private Timestamp createDate;
private long domainId;
private Date createDate;
private Domain domain;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
return id;
}
@ -24,7 +27,7 @@ public class TblApiKey {
this.id = id;
}
@Basic
@Column(name = "API_KEY", nullable = false, length = 50)
public String getApiKey() {
return apiKey;
@ -34,47 +37,47 @@ public class TblApiKey {
this.apiKey = apiKey;
}
@Basic
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() {
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Timestamp createDate) {
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
@Basic
@Column(name = "DOMAIN_ID", nullable = false)
public long getDomainId() {
return domainId;
@ManyToOne
@JoinColumn(name = "DOMAIN_ID", nullable = false)
public Domain getDomain() {
return domain;
}
public void setDomainId(long domainId) {
this.domainId = domainId;
public void setDomain(Domain domainId) {
this.domain = domain;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
TblApiKey tblApiKey = (TblApiKey) o;
if (id != tblApiKey.id) return false;
if (domainId != tblApiKey.domainId) return false;
if (apiKey != null ? !apiKey.equals(tblApiKey.apiKey) : tblApiKey.apiKey != null) return false;
if (createDate != null ? !createDate.equals(tblApiKey.createDate) : tblApiKey.createDate != null) return false;
return true;
}
@Override
public int hashCode() {
int result = (int) (id ^ (id >>> 32));
result = 31 * result + (apiKey != null ? apiKey.hashCode() : 0);
result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
result = 31 * result + (int) (domainId ^ (domainId >>> 32));
return result;
}
// @Override
// public boolean equals(Object o) {
// if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false;
//
// TblApiKey tblApiKey = (TblApiKey) o;
//
// if (id != tblApiKey.id) return false;
// if (domainId != tblApiKey.domainId) return false;
// if (apiKey != null ? !apiKey.equals(tblApiKey.apiKey) : tblApiKey.apiKey != null) return false;
// if (createDate != null ? !createDate.equals(tblApiKey.createDate) : tblApiKey.createDate != null) return false;
//
// return true;
// }
//
// @Override
// public int hashCode() {
// int result = (int) (id ^ (id >>> 32));
// result = 31 * result + (apiKey != null ? apiKey.hashCode() : 0);
// result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
// result = 31 * result + (int) (domainId ^ (domainId >>> 32));
// return result;
// }
}

11
src/main/java/com/loafle/overflow/models/TblHistory.java
View File

@ -2,6 +2,7 @@ package com.loafle.overflow.models;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
/**
* Created by root on 17. 6. 22.
@ -10,10 +11,10 @@ import java.sql.Timestamp;
@Table(name = "TBL_HISTORY", schema = "public", catalog = "postgres")
public class TblHistory {
private long id;
private Timestamp createDate;
private Date createDate;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
return id;
}
@ -22,13 +23,13 @@ public class TblHistory {
this.id = id;
}
@Basic
@Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() {
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Timestamp createDate) {
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}

144
src/main/java/com/loafle/overflow/models/TblProbeTask.java
View File

@ -1,7 +1,11 @@
package com.loafle.overflow.models;
import com.loafle.overflow.meta.MetaProbeTaskType;
import com.loafle.overflow.module.probe.model.Probe;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
/**
* Created by root on 17. 6. 22.
@ -10,17 +14,17 @@ import java.sql.Timestamp;
@Table(name = "TBL_PROBE_TASK", schema = "public", catalog = "postgres")
public class TblProbeTask {
private long id;
private short typeId;
private long probeId;
private MetaProbeTaskType metaProbeTaskType;
private Probe probe;
private String data;
private Timestamp createDate;
private Timestamp sendDate;
private Timestamp startDate;
private Timestamp endDate;
private Date createDate;
private Date sendDate;
private Date startDate;
private Date endDate;
private Boolean succeed;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
return id;
}
@ -29,26 +33,46 @@ public class TblProbeTask {
this.id = id;
}
@Basic
@Column(name = "TYPE_ID", nullable = false)
public short getTypeId() {
return typeId;
@ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false)
public MetaProbeTaskType getMetaProbeTaskType() {
return metaProbeTaskType;
}
public void setTypeId(short typeId) {
this.typeId = typeId;
public void setMetaProbeTaskType(MetaProbeTaskType metaProbeTaskType) {
this.metaProbeTaskType = metaProbeTaskType;
}
@Basic
@Column(name = "PROBE_ID", nullable = false)
public long getProbeId() {
return probeId;
@ManyToOne
@JoinColumn(name = "PROBE_ID", nullable = false)
public Probe getProbe() {
return probe;
}
public void setProbeId(long probeId) {
this.probeId = probeId;
public void setProbe(Probe probe) {
this.probe = probe;
}
// @Basic
// @Column(name = "TYPE_ID", nullable = false)
// public short getTypeId() {
// return typeId;
// }
//
// public void setTypeId(short typeId) {
// this.typeId = typeId;
// }
//
// @Basic
// @Column(name = "PROBE_ID", nullable = false)
// public long getProbeId() {
// return probeId;
// }
//
// public void setProbeId(long probeId) {
// this.probeId = probeId;
// }
@Basic
@Column(name = "DATA", nullable = true, length = 255)
public String getData() {
@ -61,41 +85,41 @@ public class TblProbeTask {
@Basic
@Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() {
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Timestamp createDate) {
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
@Basic
@Column(name = "SEND_DATE", nullable = true)
public Timestamp getSendDate() {
public Date getSendDate() {
return sendDate;
}
public void setSendDate(Timestamp sendDate) {
public void setSendDate(Date sendDate) {
this.sendDate = sendDate;
}
@Basic
@Column(name = "START_DATE", nullable = true)
public Timestamp getStartDate() {
public Date getStartDate() {
return startDate;
}
public void setStartDate(Timestamp startDate) {
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
@Basic
@Column(name = "END_DATE", nullable = true)
public Timestamp getEndDate() {
public Date getEndDate() {
return endDate;
}
public void setEndDate(Timestamp endDate) {
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
@ -109,37 +133,37 @@ public class TblProbeTask {
this.succeed = succeed;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
TblProbeTask that = (TblProbeTask) o;
if (id != that.id) return false;
if (typeId != that.typeId) return false;
if (probeId != that.probeId) return false;
if (data != null ? !data.equals(that.data) : that.data != null) return false;
if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;
if (sendDate != null ? !sendDate.equals(that.sendDate) : that.sendDate != null) return false;
if (startDate != null ? !startDate.equals(that.startDate) : that.startDate != null) return false;
if (endDate != null ? !endDate.equals(that.endDate) : that.endDate != null) return false;
if (succeed != null ? !succeed.equals(that.succeed) : that.succeed != null) return false;
return true;
}
@Override
public int hashCode() {
int result = (int) (id ^ (id >>> 32));
result = 31 * result + (int) typeId;
result = 31 * result + (int) (probeId ^ (probeId >>> 32));
result = 31 * result + (data != null ? data.hashCode() : 0);
result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
result = 31 * result + (sendDate != null ? sendDate.hashCode() : 0);
result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
result = 31 * result + (endDate != null ? endDate.hashCode() : 0);
result = 31 * result + (succeed != null ? succeed.hashCode() : 0);
return result;
}
// @Override
// public boolean equals(Object o) {
// if (this == o) return true;
// if (o == null || getClass() != o.getClass()) return false;
//
// TblProbeTask that = (TblProbeTask) o;
//
// if (id != that.id) return false;
// if (typeId != that.typeId) return false;
// if (probeId != that.probeId) return false;
// if (data != null ? !data.equals(that.data) : that.data != null) return false;
// if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;
// if (sendDate != null ? !sendDate.equals(that.sendDate) : that.sendDate != null) return false;
// if (startDate != null ? !startDate.equals(that.startDate) : that.startDate != null) return false;
// if (endDate != null ? !endDate.equals(that.endDate) : that.endDate != null) return false;
// if (succeed != null ? !succeed.equals(that.succeed) : that.succeed != null) return false;
//
// return true;
// }
//
// @Override
// public int hashCode() {
// int result = (int) (id ^ (id >>> 32));
// result = 31 * result + (int) typeId;
// result = 31 * result + (int) (probeId ^ (probeId >>> 32));
// result = 31 * result + (data != null ? data.hashCode() : 0);
// result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
// result = 31 * result + (sendDate != null ? sendDate.hashCode() : 0);
// result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
// result = 31 * result + (endDate != null ? endDate.hashCode() : 0);
// result = 31 * result + (succeed != null ? succeed.hashCode() : 0);
// return result;
// }
}

9
src/main/java/com/loafle/overflow/models/TblUiWebsocket.java
View File

@ -2,6 +2,7 @@ package com.loafle.overflow.models;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
/**
* Created by root on 17. 6. 22.
@ -10,10 +11,10 @@ import java.sql.Timestamp;
@Table(name = "TBL_UI_WEBSOCKET", schema = "public", catalog = "postgres")
public class TblUiWebsocket {
private long id;
private Timestamp createDate;
private Date createDate;
@Id
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() {
return id;
}
@ -24,11 +25,11 @@ public class TblUiWebsocket {
@Basic
@Column(name = "CREATE_DATE", nullable = true)
public Timestamp getCreateDate() {
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Timestamp createDate) {
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}