diff --git a/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java b/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java index ecdaab5..c15c4a5 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java +++ b/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java @@ -1,6 +1,6 @@ package com.loafle.overflow.module.sensor.model; -import com.loafle.overflow.module.meta.model.MetaSensorItem; +import com.loafle.overflow.module.meta.model.MetaSensorDisplayItem; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; @@ -15,7 +15,7 @@ import java.util.Date; public class SensorItem { private long id; private Sensor sensor; - private MetaSensorItem item; + private MetaSensorDisplayItem item; private Date createDate; @Id @@ -41,11 +41,11 @@ public class SensorItem { @ManyToOne @JoinColumn(name = "ITEM_ID", nullable = false) - public MetaSensorItem getItem() { + public MetaSensorDisplayItem getItem() { return item; } - public void setItem(MetaSensorItem item) { + public void setItem(MetaSensorDisplayItem item) { this.item = item; } diff --git a/src/main/resources/local/database.properties b/src/main/resources/local/database.properties index 6b6f9d1..e8c1188 100644 --- a/src/main/resources/local/database.properties +++ b/src/main/resources/local/database.properties @@ -1,4 +1,4 @@ -datasource.url=jdbc:postgresql://127.0.0.1:5432/overflow +datasource.url=jdbc:postgresql://192.168.1.50:5432/overflow datasource.username=overflow datasource.password=qwer5795 datasource.driver-class-name=org.postgresql.Driver diff --git a/src/main/resources/local/init.sql b/src/main/resources/local/init.sql index 6181197..d13ffd1 100644 --- a/src/main/resources/local/init.sql +++ b/src/main/resources/local/init.sql @@ -1021,234 +1021,234 @@ NULL,'2017-09-05 12:26:02.738','HOST-WMI_CRAWLER',23,1,3); INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_id,status,target_id) VALUES ( NULL,'2017-09-11 12:26:02.738','SERVICE-JMX_CRAWLER',17,1,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-06-26 20:21:16.626',1,1); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-06-26 20:21:50.988',2,2); - -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',5,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',6,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',7,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',8,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',9,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',10,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',11,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',12,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',13,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',14,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',15,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',16,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',17,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',18,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',19,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',20,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',21,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',22,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',23,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',24,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',25,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',26,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',27,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',28,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',29,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',30,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',31,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',32,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',33,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',34,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',35,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',36,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',37,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',38,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',39,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',40,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',41,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',42,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',43,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',44,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',45,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',46,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',47,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',48,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',49,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',50,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',51,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',52,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',53,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',54,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',55,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',56,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',57,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',58,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',59,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',60,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',61,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',62,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',63,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',64,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',65,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',66,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',67,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',68,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',69,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',70,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',71,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',72,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',73,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',74,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',75,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',76,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',77,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',78,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',79,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',80,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',81,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',82,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',83,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',84,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',85,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',86,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',87,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',88,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',89,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',90,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',91,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',92,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',93,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-08-28 16:17:05.506',94,3); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',95,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',96,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',97,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',98,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',99,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',100,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',101,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',102,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',103,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',104,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',105,4); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-05 12:26:02.738',106,4); - -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',107,5); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',108,5); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',109,5); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',110,5); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',111,5); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',112,5); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',113,5); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',114,5); -INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( -'2017-09-11 12:26:02.738',115,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-06-26 20:21:16.626',1,1); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-06-26 20:21:50.988',2,2); +-- +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',5,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',6,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',7,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',8,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',9,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',10,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',11,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',12,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',13,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',14,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',15,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',16,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',17,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',18,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',19,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',20,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',21,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',22,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',23,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',24,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',25,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',26,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',27,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',28,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',29,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',30,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',31,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',32,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',33,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',34,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',35,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',36,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',37,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',38,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',39,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',40,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',41,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',42,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',43,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',44,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',45,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',46,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',47,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',48,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',49,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',50,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',51,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',52,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',53,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',54,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',55,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',56,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',57,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',58,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',59,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',60,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',61,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',62,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',63,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',64,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',65,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',66,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',67,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',68,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',69,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',70,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',71,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',72,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',73,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',74,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',75,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',76,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',77,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',78,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',79,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',80,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',81,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',82,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',83,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',84,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',85,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',86,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',87,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',88,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',89,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',90,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',91,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',92,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',93,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-08-28 16:17:05.506',94,3); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',95,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',96,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',97,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',98,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',99,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',100,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',101,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',102,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',103,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',104,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',105,4); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-05 12:26:02.738',106,4); +-- +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',107,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',108,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',109,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',110,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',111,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',112,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',113,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',114,5); +--INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES ( +--'2017-09-11 12:26:02.738',115,5); INSERT INTO public.noauth_probe (api_key,create_date,description,temp_probe_key,domain_id,probe_id,status) VALUES ( '52abd6fd57e511e7ac52080027658d13','2017-06-26 12:43:46.877','{"host":{"name":"geek-ubuntu","os":"linux","paltform":"ubuntu","platformFamily":"debian","platformVersion":"","kernelVersion":"4.4.0-93-generic","hostID":"03000200-0400-0500-0006-000700080009"},"network":{"name":"enp3s0","address":"192.168.1.103/24|fe80::36c0:6c3e:6006:dd23/64","gateway":"192.168.1.254","macAddress":"44:8a:5b:f1:f1:f3"}}','1cf2555c57d511e79714080027658d13',1,NULL,3); diff --git a/src/test/java/com/loafle/overflow/module/sensor/service/SensorItemServiceTest.java b/src/test/java/com/loafle/overflow/module/sensor/service/SensorItemServiceTest.java index 134e226..eb8ec43 100644 --- a/src/test/java/com/loafle/overflow/module/sensor/service/SensorItemServiceTest.java +++ b/src/test/java/com/loafle/overflow/module/sensor/service/SensorItemServiceTest.java @@ -1,6 +1,6 @@ package com.loafle.overflow.module.sensor.service; -import com.loafle.overflow.module.meta.model.MetaSensorItem; +import com.loafle.overflow.module.meta.model.MetaSensorDisplayItem; import com.loafle.overflow.module.sensor.model.Sensor; import com.loafle.overflow.module.sensor.model.SensorItem; import com.loafle.overflow.spring.AppConfigTest; @@ -29,7 +29,7 @@ public class SensorItemServiceTest { public void regist() throws Exception { SensorItem sensorItem = new SensorItem(); sensorItem.setCreateDate(new Date()); - MetaSensorItem item = new MetaSensorItem(); + MetaSensorDisplayItem item = new MetaSensorDisplayItem(); item.setId(1); Sensor sensor = new Sensor(); sensor.setId(1); diff --git a/src/test/resources/database.properties b/src/test/resources/database.properties index 6b6f9d1..e8c1188 100644 --- a/src/test/resources/database.properties +++ b/src/test/resources/database.properties @@ -1,4 +1,4 @@ -datasource.url=jdbc:postgresql://127.0.0.1:5432/overflow +datasource.url=jdbc:postgresql://192.168.1.50:5432/overflow datasource.username=overflow datasource.password=qwer5795 datasource.driver-class-name=org.postgresql.Driver