crawler //
This commit is contained in:
snoop 2017-06-22 20:22:26 +09:00
parent 3bccb0220d
commit ed721bffa0
13 changed files with 205 additions and 180 deletions

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -10,12 +11,12 @@ import java.sql.Timestamp;
@Table(name = "TBL_META_CRAWLER", schema = "public", catalog = "postgres") @Table(name = "TBL_META_CRAWLER", schema = "public", catalog = "postgres")
public class MetaCrawler { public class MetaCrawler {
private short id; private short id;
private Timestamp createDate; private Date createDate;
private String name; private String name;
private String desc; private String desc;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() { public short getId() {
return id; return id;
} }
@ -24,17 +25,16 @@ public class MetaCrawler {
this.id = id; this.id = id;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = true) @Column(name="CREATE_DATE", nullable=false)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }
@Basic
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -44,7 +44,6 @@ public class MetaCrawler {
this.name = name; this.name = name;
} }
@Basic
@Column(name = "DESC", nullable = true, length = 100) @Column(name = "DESC", nullable = true, length = 100)
public String getDesc() { public String getDesc() {
return desc; return desc;

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -14,7 +15,7 @@ public class MetaCrawlerInputItem {
private short crawlerId; private short crawlerId;
private String desc; private String desc;
private String name; private String name;
private Timestamp createDate; private Date createDate;
private boolean required; private boolean required;
private String defaultValue; private String defaultValue;
private String pattern; private String pattern;
@ -22,7 +23,7 @@ public class MetaCrawlerInputItem {
private String keyValue; private String keyValue;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public int getId() { public int getId() {
return id; return id;
} }
@ -51,7 +52,6 @@ public class MetaCrawlerInputItem {
this.crawlerId = crawlerId; this.crawlerId = crawlerId;
} }
@Basic
@Column(name = "DESC", nullable = true, length = 50) @Column(name = "DESC", nullable = true, length = 50)
public String getDesc() { public String getDesc() {
return desc; return desc;
@ -61,7 +61,7 @@ public class MetaCrawlerInputItem {
this.desc = desc; this.desc = desc;
} }
@Basic
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -71,17 +71,16 @@ public class MetaCrawlerInputItem {
this.name = name; this.name = name;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false) @Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }
@Basic
@Column(name = "REQUIRED", nullable = false) @Column(name = "REQUIRED", nullable = false)
public boolean isRequired() { public boolean isRequired() {
return required; return required;
@ -91,7 +90,6 @@ public class MetaCrawlerInputItem {
this.required = required; this.required = required;
} }
@Basic
@Column(name = "DEFAULT_VALUE", nullable = true, length = 50) @Column(name = "DEFAULT_VALUE", nullable = true, length = 50)
public String getDefaultValue() { public String getDefaultValue() {
return defaultValue; return defaultValue;
@ -101,7 +99,7 @@ public class MetaCrawlerInputItem {
this.defaultValue = defaultValue; this.defaultValue = defaultValue;
} }
@Basic
@Column(name = "PATTERN", nullable = true, length = 50) @Column(name = "PATTERN", nullable = true, length = 50)
public String getPattern() { public String getPattern() {
return pattern; return pattern;
@ -111,7 +109,7 @@ public class MetaCrawlerInputItem {
this.pattern = pattern; this.pattern = pattern;
} }
@Basic
@Column(name = "KEY_NAME", nullable = true, length = 50) @Column(name = "KEY_NAME", nullable = true, length = 50)
public String getKeyName() { public String getKeyName() {
return keyName; return keyName;
@ -121,7 +119,7 @@ public class MetaCrawlerInputItem {
this.keyName = keyName; this.keyName = keyName;
} }
@Basic
@Column(name = "KEY_VALUE", nullable = true, length = 50) @Column(name = "KEY_VALUE", nullable = true, length = 50)
public String getKeyValue() { public String getKeyValue() {
return keyValue; return keyValue;

View File

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

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -11,11 +12,11 @@ import java.sql.Timestamp;
public class MetaInfraVendor { public class MetaInfraVendor {
private int id; private int id;
private String name; private String name;
private Timestamp createDate; private Date createDate;
private int typeId; private MetaInfraType metaInfraType;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public int getId() { public int getId() {
return id; return id;
} }
@ -34,47 +35,58 @@ public class MetaInfraVendor {
this.name = name; this.name = name;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false) @Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }
@Basic // @Basic
@Column(name = "TYPE_ID", nullable = false) // @Column(name = "TYPE_ID", nullable = false)
public int getTypeId() { // public int getTypeId() {
return typeId; // return typeId;
// }
//
// public void setTypeId(int typeId) {
// this.typeId = typeId;
// }
@ManyToOne
@JoinColumn(name = "TYPE_ID", nullable=false)
public MetaInfraType getMetaInfraType() {
return metaInfraType;
} }
public void setTypeId(int typeId) { public void setMetaInfraType(MetaInfraType metaInfraType) {
this.typeId = typeId; this.metaInfraType = metaInfraType;
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
MetaInfraVendor that = (MetaInfraVendor) o; // @Override
// public boolean equals(Object o) {
if (id != that.id) return false; // if (this == o) return true;
if (typeId != that.typeId) return false; // if (o == null || getClass() != o.getClass()) return false;
if (name != null ? !name.equals(that.name) : that.name != null) return false; //
if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; // MetaInfraVendor that = (MetaInfraVendor) o;
//
return true; // if (id != that.id) return false;
} // if (typeId != that.typeId) return false;
// if (name != null ? !name.equals(that.name) : that.name != null) return false;
@Override // if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;
public int hashCode() { //
int result = id; // return true;
result = 31 * result + (name != null ? name.hashCode() : 0); // }
result = 31 * result + (createDate != null ? createDate.hashCode() : 0); //
result = 31 * result + typeId; // @Override
return result; // public int hashCode() {
} // int result = id;
// result = 31 * result + (name != null ? name.hashCode() : 0);
// result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
// result = 31 * result + typeId;
// return result;
// }
} }

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -12,10 +13,10 @@ public class MetaInputType {
private short id; private short id;
private String name; private String name;
private String desc; private String desc;
private Timestamp createDate; private Date createDate;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() { public short getId() {
return id; return id;
} }
@ -24,7 +25,7 @@ public class MetaInputType {
this.id = id; this.id = id;
} }
@Basic
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -34,7 +35,7 @@ public class MetaInputType {
this.name = name; this.name = name;
} }
@Basic
@Column(name = "DESC", nullable = true, length = 50) @Column(name = "DESC", nullable = true, length = 50)
public String getDesc() { public String getDesc() {
return desc; return desc;
@ -44,13 +45,13 @@ public class MetaInputType {
this.desc = desc; this.desc = desc;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = true) @Column(name = "CREATE_DATE", nullable = true)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }

View File

@ -12,7 +12,7 @@ public class MetaMemberStatus {
private String name; private String name;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() { public short getId() {
return id; return id;
} }
@ -21,7 +21,7 @@ public class MetaMemberStatus {
this.id = id; this.id = id;
} }
@Basic
@Column(name = "Name", nullable = false, length = 10) @Column(name = "Name", nullable = false, length = 10)
public String getName() { public String getName() {
return name; return name;

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -10,12 +11,12 @@ import java.sql.Timestamp;
@Table(name = "TBL_META_NOTIFICATION", schema = "public", catalog = "postgres") @Table(name = "TBL_META_NOTIFICATION", schema = "public", catalog = "postgres")
public class MetaNotification { public class MetaNotification {
private long id; private long id;
private Timestamp createDate; private Date createDate;
private String name; private String name;
private String description; private String description;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() { public long getId() {
return id; return id;
} }
@ -24,17 +25,17 @@ public class MetaNotification {
this.id = id; this.id = id;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false) @Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }
@Basic
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -44,7 +45,7 @@ public class MetaNotification {
this.name = name; this.name = name;
} }
@Basic
@Column(name = "DESCRIPTION", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)
public String getDescription() { public String getDescription() {
return description; return description;

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -11,10 +12,10 @@ import java.sql.Timestamp;
public class MetaProbeArchitecture { public class MetaProbeArchitecture {
private short id; private short id;
private String archi; private String archi;
private Timestamp createDate; private Date createDate;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() { public short getId() {
return id; return id;
} }
@ -23,7 +24,7 @@ public class MetaProbeArchitecture {
this.id = id; this.id = id;
} }
@Basic
@Column(name = "ARCHI", nullable = true, length = 10) @Column(name = "ARCHI", nullable = true, length = 10)
public String getArchi() { public String getArchi() {
return archi; return archi;
@ -33,13 +34,13 @@ public class MetaProbeArchitecture {
this.archi = archi; this.archi = archi;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = true) @Column(name = "CREATE_DATE", nullable = true)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -11,10 +12,10 @@ import java.sql.Timestamp;
public class MetaProbeOs { public class MetaProbeOs {
private short id; private short id;
private String name; private String name;
private Timestamp createDate; private Date createDate;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() { public short getId() {
return id; return id;
} }
@ -33,13 +34,13 @@ public class MetaProbeOs {
this.name = name; this.name = name;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = true) @Column(name = "CREATE_DATE", nullable = true)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -10,13 +11,13 @@ import java.sql.Timestamp;
@Table(name = "TBL_META_PROBE_PACKAGE", schema = "public", catalog = "postgres") @Table(name = "TBL_META_PROBE_PACKAGE", schema = "public", catalog = "postgres")
public class MetaProbePackage { public class MetaProbePackage {
private long id; private long id;
private short versionId; private MetaProbeVersion versionId;
private short osId; private MetaProbeOs osId;
private short architectureId; private MetaProbeArchitecture architectureId;
private Timestamp createDate; private Date createDate;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public long getId() { public long getId() {
return id; return id;
} }
@ -25,69 +26,69 @@ public class MetaProbePackage {
this.id = id; this.id = id;
} }
@Basic @ManyToOne
@Column(name = "VERSION_ID", nullable = false) @JoinColumn(name = "VERSION_ID", nullable = false)
public short getVersionId() { public MetaProbeVersion getVersionId() {
return versionId; return versionId;
} }
public void setVersionId(short versionId) { public void setVersionId(MetaProbeVersion versionId) {
this.versionId = versionId; this.versionId = versionId;
} }
@Basic @ManyToOne
@Column(name = "OS_ID", nullable = false) @JoinColumn(name = "OS_ID", nullable = false)
public short getOsId() { public MetaProbeOs getOsId() {
return osId; return osId;
} }
public void setOsId(short osId) { public void setOsId(MetaProbeOs osId) {
this.osId = osId; this.osId = osId;
} }
@Basic @ManyToOne
@Column(name = "ARCHITECTURE_ID", nullable = false) @JoinColumn(name = "ARCHITECTURE_ID", nullable = false)
public short getArchitectureId() { public MetaProbeArchitecture getArchitectureId() {
return architectureId; return architectureId;
} }
public void setArchitectureId(short architectureId) { public void setArchitectureId(MetaProbeArchitecture architectureId) {
this.architectureId = architectureId; this.architectureId = architectureId;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false) @Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }
@Override // @Override
public boolean equals(Object o) { // public boolean equals(Object o) {
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;
//
// MetaProbePackage that = (MetaProbePackage) o;
//
// if (id != that.id) return false;
// if (versionId != that.versionId) return false;
// if (osId != that.osId) return false;
// if (architectureId != that.architectureId) return false;
// if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;
//
// return true;
// }
MetaProbePackage that = (MetaProbePackage) o; // @Override
// public int hashCode() {
if (id != that.id) return false; // int result = (int) (id ^ (id >>> 32));
if (versionId != that.versionId) return false; // result = 31 * result + (int) versionId;
if (osId != that.osId) return false; // result = 31 * result + (int) osId;
if (architectureId != that.architectureId) return false; // result = 31 * result + (int) architectureId;
if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false; // result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
// return result;
return true; // }
}
@Override
public int hashCode() {
int result = (int) (id ^ (id >>> 32));
result = 31 * result + (int) versionId;
result = 31 * result + (int) osId;
result = 31 * result + (int) architectureId;
result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
return result;
}
} }

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -12,10 +13,10 @@ public class MetaProbeTaskType {
private short id; private short id;
private String name; private String name;
private String desc; private String desc;
private Timestamp createDate; private Date createDate;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() { public short getId() {
return id; return id;
} }
@ -24,7 +25,7 @@ public class MetaProbeTaskType {
this.id = id; this.id = id;
} }
@Basic
@Column(name = "NAME", nullable = false, length = 50) @Column(name = "NAME", nullable = false, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -34,7 +35,7 @@ public class MetaProbeTaskType {
this.name = name; this.name = name;
} }
@Basic
@Column(name = "DESC", nullable = false, length = 50) @Column(name = "DESC", nullable = false, length = 50)
public String getDesc() { public String getDesc() {
return desc; return desc;
@ -44,13 +45,13 @@ public class MetaProbeTaskType {
this.desc = desc; this.desc = desc;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false) @Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -11,10 +12,10 @@ import java.sql.Timestamp;
public class MetaProbeVersion { public class MetaProbeVersion {
private short id; private short id;
private String version; private String version;
private Timestamp createDate; private Date createDate;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public short getId() { public short getId() {
return id; return id;
} }
@ -33,13 +34,13 @@ public class MetaProbeVersion {
this.version = version; this.version = version;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = true) @Column(name = "CREATE_DATE", nullable = true)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }

View File

@ -2,6 +2,7 @@ package com.loafle.overflow.meta;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Date;
/** /**
* Created by root on 17. 6. 22. * Created by root on 17. 6. 22.
@ -10,13 +11,13 @@ import java.sql.Timestamp;
@Table(name = "TBL_META_SENSOR_ITEM", schema = "public", catalog = "postgres") @Table(name = "TBL_META_SENSOR_ITEM", schema = "public", catalog = "postgres")
public class MetaSensorItem { public class MetaSensorItem {
private int id; private int id;
private short typeId; private MetaSensorItemType metaSensorItemType;
private String key; private String key;
private String name; private String name;
private Timestamp createDate; private Date createDate;
@Id @Id
@Column(name = "ID", nullable = false) @GeneratedValue(strategy= GenerationType.IDENTITY)
public int getId() { public int getId() {
return id; return id;
} }
@ -25,17 +26,25 @@ public class MetaSensorItem {
this.id = id; this.id = id;
} }
@Basic
// @Column(name = "TYPE_ID", nullable = false)
// public short getTypeId() {
// return typeId;
// }
//
// public void setTypeId(short typeId) {
// this.typeId = typeId;
// }
@Column(name = "TYPE_ID", nullable = false) @Column(name = "TYPE_ID", nullable = false)
public short getTypeId() { public MetaSensorItemType getMetaSensorItemType() {
return typeId; return metaSensorItemType;
} }
public void setTypeId(short typeId) { public void setMetaSensorItemType(MetaSensorItemType metaSensorItemType) {
this.typeId = typeId; this.metaSensorItemType = metaSensorItemType;
} }
@Basic
@Column(name = "KEY", nullable = true, length = 50) @Column(name = "KEY", nullable = true, length = 50)
public String getKey() { public String getKey() {
return key; return key;
@ -45,7 +54,6 @@ public class MetaSensorItem {
this.key = key; this.key = key;
} }
@Basic
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;
@ -55,39 +63,39 @@ public class MetaSensorItem {
this.name = name; this.name = name;
} }
@Basic @Temporal(TemporalType.TIMESTAMP)
@Column(name = "CREATE_DATE", nullable = false) @Column(name = "CREATE_DATE", nullable = false)
public Timestamp getCreateDate() { public Date getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Timestamp createDate) { public void setCreateDate(Date createDate) {
this.createDate = createDate; this.createDate = createDate;
} }
@Override // @Override
public boolean equals(Object o) { // public boolean equals(Object o) {
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;
//
MetaSensorItem that = (MetaSensorItem) o; // MetaSensorItem that = (MetaSensorItem) 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;
if (key != null ? !key.equals(that.key) : that.key != null) return false; // if (key != null ? !key.equals(that.key) : that.key != null) return false;
if (name != null ? !name.equals(that.name) : that.name != null) return false; // if (name != null ? !name.equals(that.name) : that.name != null) 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;
//
return true; // return true;
} // }
//
@Override // @Override
public int hashCode() { // public int hashCode() {
int result = id; // int result = id;
result = 31 * result + (int) typeId; // result = 31 * result + (int) typeId;
result = 31 * result + (key != null ? key.hashCode() : 0); // result = 31 * result + (key != null ? key.hashCode() : 0);
result = 31 * result + (name != null ? name.hashCode() : 0); // result = 31 * result + (name != null ? name.hashCode() : 0);
result = 31 * result + (createDate != null ? createDate.hashCode() : 0); // result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
return result; // return result;
} // }
} }