sensor model changed

src/main/java/com/loafle/overflow/model/meta/MetaCollectionItemMapping.java

@@ -10,8 +10,8 @@ public class MetaCollectionItemMapping {
   private Short id;
 
   @ManyToOne
-  @JoinColumn(name = "META_CRAWLER_MAPPING_ID", nullable = false)
+  @JoinColumn(name = "META_DISPLAY_ITEM_MAPPING_ID", nullable = false)
-  private MetaCrawlerMapping metaCrawlerMapping;
+  private MetaDisplayItemMapping metaDisplayItemMapping;
 
   @ManyToOne
   @JoinColumn(name = "META_COLLECTION_ITEM_ID", nullable = false)
@@ -29,12 +29,12 @@ public class MetaCollectionItemMapping {
     this.id = id;
   }
 
-  public MetaCrawlerMapping getMetaCrawlerMapping() {
+  public MetaDisplayItemMapping getMetaDisplayItemMapping() {
-    return metaCrawlerMapping;
+    return metaDisplayItemMapping;
   }
 
-  public void setMetaCrawlerMapping(MetaCrawlerMapping metaCrawlerMapping) {
+  public void setMetaDisplayItemMapping(MetaDisplayItemMapping metaDisplayItemMapping) {
-    this.metaCrawlerMapping = metaCrawlerMapping;
+    this.metaDisplayItemMapping = metaDisplayItemMapping;
   }
 
   public MetaCollectionItem getMetaCollectionItem() {

src/main/java/com/loafle/overflow/model/meta/MetaSensorItemKey.java

@@ -1,116 +0,0 @@
-package com.loafle.overflow.model.meta;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by snoop on 17. 8. 29.
- */
-@Entity
-@Table(name = "META_SENSOR_ITEM_KEY", schema = "public")
-public class MetaSensorItemKey {
-
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
-
-  @Column(name = "KEY", nullable = false, length = 100)
-  private String key;
-
-  @Column(name = "NAME", nullable = true, length = 100)
-  private String name;
-
-  @Column(name = "FROMS", nullable = false, length = 100)
-  private String froms;
-
-  @Column(name = "OPTION_JSON", nullable = true)
-  private String option;
-
-  @ManyToOne
-  @JoinColumn(name = "META_SENSOR_ITEM_ID", nullable = false)
-  private MetaCollectionItem metaCollectionItem;
-
-  @ManyToOne
-  @JoinColumn(name = "META_CRAWLER_ID", nullable = false)
-  private MetaCrawler metaCrawler;
-
-  @ManyToOne
-  @JoinColumn(name = "META_SENSOR_ITEM_UNIT_ID", nullable = true)
-  private MetaItemUnit metaItemUnit;
-
-  @Temporal(TemporalType.TIMESTAMP)
-  @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = false)
-  private Date createDate;
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public MetaCollectionItem getMetaCollectionItem() {
-    return metaCollectionItem;
-  }
-
-  public void setMetaCollectionItem(MetaCollectionItem metaCollectionItem) {
-    this.metaCollectionItem = metaCollectionItem;
-  }
-
-  public String getKey() {
-    return key;
-  }
-
-  public void setKey(String key) {
-    this.key = key;
-  }
-
-  public String getFroms() {
-    return froms;
-  }
-
-  public void setFroms(String froms) {
-    this.froms = froms;
-  }
-
-  public String getOption() {
-    return option;
-  }
-
-  public void setOption(String option) {
-    this.option = option;
-  }
-
-  public MetaCrawler getMetaCrawler() {
-    return metaCrawler;
-  }
-
-  public void setMetaCrawler(MetaCrawler metaCrawler) {
-    this.metaCrawler = metaCrawler;
-  }
-
-  public Date getCreateDate() {
-    return createDate;
-  }
-
-  public void setCreateDate(Date createDate) {
-    this.createDate = createDate;
-  }
-
-  public MetaItemUnit getMetaItemUnit() {
-    return metaItemUnit;
-  }
-
-  public void setMetaItemUnit(MetaItemUnit metaItemUnit) {
-    this.metaItemUnit = metaItemUnit;
-  }
-}

src/main/java/com/loafle/overflow/model/sensor/Sensor.java

@@ -1,6 +1,5 @@
 package com.loafle.overflow.model.sensor;
 
-import com.loafle.overflow.model.meta.MetaCrawler;
 import com.loafle.overflow.model.meta.MetaCrawlerMapping;
 import com.loafle.overflow.model.meta.MetaDisplayItem;
 import com.loafle.overflow.model.meta.MetaSensorStatus;

src/main/java/com/loafle/overflow/model/sensor/SensorItem.java

@@ -1,6 +1,5 @@
 package com.loafle.overflow.model.sensor;
 
-import com.loafle.overflow.model.meta.MetaDisplayItem;
 import com.loafle.overflow.model.meta.MetaDisplayItemMapping;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;

src/main/java/com/loafle/overflow/service/central/meta/MetaDisplayItemMappingService.java

@@ -3,9 +3,6 @@ package com.loafle.overflow.service.central.meta;
 import com.loafle.overflow.core.annotation.WebappAPI;
 import com.loafle.overflow.core.exception.OverflowException;
 import com.loafle.overflow.model.meta.MetaDisplayItemMapping;
-import com.loafle.overflow.model.meta.MetaSensorItemKey;
-
-import java.util.List;
 
 /**
  * Created by snoop on 18. 4. 24.
@@ -13,7 +10,4 @@ import java.util.List;
 public interface MetaDisplayItemMappingService {
   @WebappAPI
   MetaDisplayItemMapping regist(MetaDisplayItemMapping metaDisplayItemMapping) throws OverflowException;
-
-  @WebappAPI
-  List<MetaSensorItemKey> readAllMetaSensorItemKeyByDisplayItemID(Long metaSensorDisplayItemID) throws OverflowException;
 }

src/main/java/com/loafle/overflow/service/central/meta/MetaDisplayItemService.java

@@ -4,8 +4,6 @@ import com.loafle.overflow.core.annotation.WebappAPI;
 import com.loafle.overflow.core.exception.OverflowException;
 import com.loafle.overflow.model.meta.MetaDisplayItem;
 
-import java.util.List;
-
 /**
  * Created by insanity on 17. 9. 20.
  */

src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemKeyService.java

@@ -1,19 +0,0 @@
-package com.loafle.overflow.service.central.meta;
-
-import com.loafle.overflow.core.annotation.WebappAPI;
-import com.loafle.overflow.core.exception.OverflowException;
-import com.loafle.overflow.model.meta.MetaSensorItemKey;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by snoop on 17. 8. 29.
- */
-public interface MetaSensorItemKeyService {
-  @WebappAPI
-  List<MetaSensorItemKey> readAllByMetaCrawlerID(Short metaCrawlerID) throws OverflowException;
-
-  @WebappAPI
-  Map<Integer, MetaSensorItemKey> readAllMapByMetaCrawlerID(Short metaCrawlerID) throws OverflowException;
-}