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

fixed

Browse Source 
DESC -> DESCRIPTION
This commit is contained in:
snoop 2017-06-23 11:50:11 +09:00
parent c0dddbfdca
commit 341defb273
6 changed files with 37 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/loafle/overflow/meta/MetaCrawler.java
View File

@ -13,7 +13,7 @@ public class MetaCrawler {
private short id; private short id;
private Date createDate; private Date createDate;
private String name; private String name;
private String desc; private String description;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy= GenerationType.IDENTITY)
@ -44,13 +44,14 @@ public class MetaCrawler {
this.name = name; this.name = name;
} }
@Column(name = "DESC", nullable = true, length = 100) @Column(name = "DESCRIPTION", nullable = true, length = 100)
public String getDesc() { public String getDescription() {
return desc; return description;
} }
public void setDesc(String desc) { public void setDescription(String description) {
this.desc = desc; this.description = description;
} }
} }

32
src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java
View File

@ -13,7 +13,7 @@ public class MetaCrawlerInputItem {
private int id; private int id;
private MetaInputType metaInputType; private MetaInputType metaInputType;
private MetaCrawler metaCrawler; private MetaCrawler metaCrawler;
private String desc; private String description;
private String name; private String name;
private Date createDate; private Date createDate;
private boolean required; private boolean required;
@ -32,25 +32,6 @@ public class MetaCrawlerInputItem {
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;
// }
//
// @Basic
// @Column(name = "CRAWLER_ID", nullable = false)
// public short getCrawlerId() {
// return crawlerId;
// }
//
// public void setCrawlerId(short crawlerId) {
// this.crawlerId = crawlerId;
// }
@ManyToOne @ManyToOne
@JoinColumn(name = "TYPE_ID", nullable = false) @JoinColumn(name = "TYPE_ID", nullable = false)
@ -72,16 +53,15 @@ public class MetaCrawlerInputItem {
this.metaCrawler = metaCrawler; this.metaCrawler = metaCrawler;
} }
@Column(name = "DESC", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)
public String getDesc() { public String getDescription() {
return desc; return description;
} }
public void setDesc(String desc) { public void setDescription(String description) {
this.desc = desc; this.description = description;
} }
@Column(name = "NAME", nullable = true, length = 50) @Column(name = "NAME", nullable = true, length = 50)
public String getName() { public String getName() {
return name; return name;

12
src/main/java/com/loafle/overflow/meta/MetaInputType.java
View File

@ -12,7 +12,7 @@ import java.util.Date;
public class MetaInputType { public class MetaInputType {
private short id; private short id;
private String name; private String name;
private String desc; private String description;
private Date createDate; private Date createDate;
@Id @Id
@ -36,13 +36,13 @@ public class MetaInputType {
} }
@Column(name = "DESC", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)
public String getDesc() { public String getDescription() {
return desc; return description;
} }
public void setDesc(String desc) { public void setDescription(String description) {
this.desc = desc; this.description = description;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)

14
src/main/java/com/loafle/overflow/meta/MetaNotification.java
View File

@ -13,7 +13,7 @@ public class MetaNotification {
private long id; private long id;
private Date createDate; private Date createDate;
private String name; private String name;
private String desc; private String description;
@Id @Id
@GeneratedValue(strategy= GenerationType.IDENTITY) @GeneratedValue(strategy= GenerationType.IDENTITY)
@ -45,14 +45,12 @@ public class MetaNotification {
this.name = name; this.name = name;
} }
@Column(name = "DESCRIPTION", nullable = true, length = 50)
@Column(name = "desc", nullable = true, length = 50) public String getDescription() {
public String getDesc() { return description;
return desc;
} }
public void setDesc(String desc) { public void setDescription(String description) {
this.desc = desc; this.description = description;
} }
} }

35
src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java
View File

@ -12,7 +12,7 @@ import java.util.Date;
public class MetaProbeTaskType { public class MetaProbeTaskType {
private short id; private short id;
private String name; private String name;
private String desc; private String description;
private Date createDate; private Date createDate;
@Id @Id
@ -35,14 +35,13 @@ public class MetaProbeTaskType {
this.name = name; this.name = name;
} }
@Column(name = "DESCRIPTION", nullable = false, length = 50)
@Column(name = "DESC", nullable = false, length = 50) public String getDescription() {
public String getDesc() { return description;
return desc;
} }
public void setDesc(String desc) { public void setDescription(String description) {
this.desc = desc; this.description = description;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
@ -55,27 +54,5 @@ public class MetaProbeTaskType {
this.createDate = createDate; this.createDate = createDate;
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
MetaProbeTaskType that = (MetaProbeTaskType) o;
if (id != that.id) return false;
if (name != null ? !name.equals(that.name) : that.name != null) return false;
if (desc != null ? !desc.equals(that.desc) : that.desc != null) return false;
if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;
return true;
}
@Override
public int hashCode() {
int result = (int) id;
result = 31 * result + (name != null ? name.hashCode() : 0);
result = 31 * result + (desc != null ? desc.hashCode() : 0);
result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
return result;
}
} }

12
src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java
View File

@ -12,7 +12,7 @@ import java.util.Date;
public class MetaSensorItemType { public class MetaSensorItemType {
private short id; private short id;
private String name; private String name;
private String desc; private String description;
private Date createDate; private Date createDate;
@Id @Id
@ -36,13 +36,13 @@ public class MetaSensorItemType {
} }
@Column(name = "DESC", nullable = true, length = 50) @Column(name = "DESCRIPTION", nullable = true, length = 50)
public String getDesc() { public String getDescription() {
return desc; return description;
} }
public void setDesc(String desc) { public void setDescription(String description) {
this.desc = desc; this.description = description;
} }
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)