diff --git a/pom.xml b/pom.xml index a2b67d6..7247944 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ com.loafle.overflow commons-java jar - 1.0.110-SNAPSHOT + 1.0.111-SNAPSHOT com.loafle.overflow.commons-java diff --git a/src/main/java/com/loafle/overflow/model/meta/MetaCrawler.java b/src/main/java/com/loafle/overflow/model/meta/MetaCrawler.java index 0543cd7..fcb36de 100644 --- a/src/main/java/com/loafle/overflow/model/meta/MetaCrawler.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaCrawler.java @@ -13,10 +13,6 @@ public class MetaCrawler { @Id private Short id; - @ManyToOne - @JoinColumn(name = "META_CRAWLER_CONTAINER_ID", nullable = false) - private MetaCrawlerContainer metaCrawlerContainer; - @Column(name = "KEY", nullable = true, length = 50) private String key; @@ -31,7 +27,6 @@ public class MetaCrawler { @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) private Date createDate; - public Short getId() { return id; } @@ -40,14 +35,6 @@ public class MetaCrawler { this.id = id; } - public MetaCrawlerContainer getMetaCrawlerContainer() { - return metaCrawlerContainer; - } - - public void setMetaCrawlerContainer(MetaCrawlerContainer metaCrawlerContainer) { - this.metaCrawlerContainer = metaCrawlerContainer; - } - public String getKey() { return key; } diff --git a/src/main/java/com/loafle/overflow/model/meta/MetaCrawlerMapping.java b/src/main/java/com/loafle/overflow/model/meta/MetaCrawlerMapping.java index ef2aa4d..0dd2ccd 100644 --- a/src/main/java/com/loafle/overflow/model/meta/MetaCrawlerMapping.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaCrawlerMapping.java @@ -33,6 +33,10 @@ public class MetaCrawlerMapping { @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) private Date createDate; + @ManyToOne + @JoinColumn(name = "META_CRAWLER_CONTAINER_ID", nullable = false) + private MetaCrawlerContainer metaCrawlerContainer; + public Long getId() { return id; } @@ -73,6 +77,14 @@ public class MetaCrawlerMapping { isDefault = aDefault; } + public MetaCrawlerContainer getMetaCrawlerContainer() { + return metaCrawlerContainer; + } + + public void setMetaCrawlerContainer(MetaCrawlerContainer metaCrawlerContainer) { + this.metaCrawlerContainer = metaCrawlerContainer; + } + public Date getCreateDate() { return createDate; } diff --git a/src/main/java/com/loafle/overflow/model/sensor/Sensor.java b/src/main/java/com/loafle/overflow/model/sensor/Sensor.java index 1f17221..0357f37 100644 --- a/src/main/java/com/loafle/overflow/model/sensor/Sensor.java +++ b/src/main/java/com/loafle/overflow/model/sensor/Sensor.java @@ -48,6 +48,9 @@ public class Sensor { @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false) private Date createDate; + @Column(name = "INTERVAL", nullable = false) + private Integer interval; + @Transient private List sensorItems;