diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index 7b9e5fd..ce1b74f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -45,7 +45,7 @@ String msg=""; List pgAlarmTypeDtoList=new ArrayList(); try { - pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto(); if(pgAlarmTypeDtoList.size()==0) msg="没有报警类型信息"; else diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index 7b9e5fd..ce1b74f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -45,7 +45,7 @@ String msg=""; List pgAlarmTypeDtoList=new ArrayList(); try { - pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto(); if(pgAlarmTypeDtoList.size()==0) msg="没有报警类型信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 7e587a1..36a4fc5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -116,7 +116,7 @@ @POST @Path("addDevice") @Produces(MediaType.APPLICATION_JSON) - public Map addLog(@FormParam("devType") String devType, + public Map addDevice(@FormParam("devType") String devType, @FormParam("devCode") String devCode, @FormParam("devName") String devName, @FormParam("brand") String brand, diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index 7b9e5fd..ce1b74f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -45,7 +45,7 @@ String msg=""; List pgAlarmTypeDtoList=new ArrayList(); try { - pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto(); if(pgAlarmTypeDtoList.size()==0) msg="没有报警类型信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 7e587a1..36a4fc5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -116,7 +116,7 @@ @POST @Path("addDevice") @Produces(MediaType.APPLICATION_JSON) - public Map addLog(@FormParam("devType") String devType, + public Map addDevice(@FormParam("devType") String devType, @FormParam("devCode") String devCode, @FormParam("devName") String devName, @FormParam("brand") String brand, diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b872eb4..756894f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -34,29 +34,6 @@ } /** - * - */ - @POST - @Path("getPgDeviceTypeByDevType") - @Produces(MediaType.APPLICATION_JSON) - public Map getPgDeviceTypeByDevType(@FormParam("devType") String devType) throws Exception { - Map resultMap = new HashMap(); - String msg = ""; - PgDeviceTypeDto pgDeviceTypeDto=null; - try { - PgDeviceType pgDeviceType = pgDeviceTypeManager.getPgDeviceTypeByDevType(devType); - pgDeviceTypeDto=new PgDeviceTypeDto(pgDeviceType); - msg = "获取成功"; - } catch (Exception e) { - msg = "获取失败"; - e.printStackTrace(); - } - resultMap.put("msg", msg); - resultMap.put("result", pgDeviceTypeDto); - return resultMap; - } - - /** * 获取设备类型 */ @POST @@ -81,4 +58,43 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDeviceType") + @Produces(MediaType.APPLICATION_JSON) + public Map addDeviceType(@FormParam("devType") String devType) + throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + if (pgDeviceTypeManager.getPgDeviceTypeByDevType(devType)!=null) { + result = "false"; + msg = "已存在同名设备类型"; + } else { + PgDeviceType pgDeviceType=new PgDeviceType(); + pgDeviceType.setDevType(devType); + pgDeviceType.setActive(1); + + pgDeviceTypeManager.save(pgDeviceType); + result = "true"; + msg = "保存成功"; + } + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + + return resultMap; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index 7b9e5fd..ce1b74f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -45,7 +45,7 @@ String msg=""; List pgAlarmTypeDtoList=new ArrayList(); try { - pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto(); if(pgAlarmTypeDtoList.size()==0) msg="没有报警类型信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 7e587a1..36a4fc5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -116,7 +116,7 @@ @POST @Path("addDevice") @Produces(MediaType.APPLICATION_JSON) - public Map addLog(@FormParam("devType") String devType, + public Map addDevice(@FormParam("devType") String devType, @FormParam("devCode") String devCode, @FormParam("devName") String devName, @FormParam("brand") String brand, diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b872eb4..756894f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -34,29 +34,6 @@ } /** - * - */ - @POST - @Path("getPgDeviceTypeByDevType") - @Produces(MediaType.APPLICATION_JSON) - public Map getPgDeviceTypeByDevType(@FormParam("devType") String devType) throws Exception { - Map resultMap = new HashMap(); - String msg = ""; - PgDeviceTypeDto pgDeviceTypeDto=null; - try { - PgDeviceType pgDeviceType = pgDeviceTypeManager.getPgDeviceTypeByDevType(devType); - pgDeviceTypeDto=new PgDeviceTypeDto(pgDeviceType); - msg = "获取成功"; - } catch (Exception e) { - msg = "获取失败"; - e.printStackTrace(); - } - resultMap.put("msg", msg); - resultMap.put("result", pgDeviceTypeDto); - return resultMap; - } - - /** * 获取设备类型 */ @POST @@ -81,4 +58,43 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDeviceType") + @Produces(MediaType.APPLICATION_JSON) + public Map addDeviceType(@FormParam("devType") String devType) + throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + if (pgDeviceTypeManager.getPgDeviceTypeByDevType(devType)!=null) { + result = "false"; + msg = "已存在同名设备类型"; + } else { + PgDeviceType pgDeviceType=new PgDeviceType(); + pgDeviceType.setDevType(devType); + pgDeviceType.setActive(1); + + pgDeviceTypeManager.save(pgDeviceType); + result = "true"; + msg = "保存成功"; + } + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + + return resultMap; + } + } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index e2dbc1c..0000000 --- "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index 7b9e5fd..ce1b74f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -45,7 +45,7 @@ String msg=""; List pgAlarmTypeDtoList=new ArrayList(); try { - pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto(); if(pgAlarmTypeDtoList.size()==0) msg="没有报警类型信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 7e587a1..36a4fc5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -116,7 +116,7 @@ @POST @Path("addDevice") @Produces(MediaType.APPLICATION_JSON) - public Map addLog(@FormParam("devType") String devType, + public Map addDevice(@FormParam("devType") String devType, @FormParam("devCode") String devCode, @FormParam("devName") String devName, @FormParam("brand") String brand, diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b872eb4..756894f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -34,29 +34,6 @@ } /** - * - */ - @POST - @Path("getPgDeviceTypeByDevType") - @Produces(MediaType.APPLICATION_JSON) - public Map getPgDeviceTypeByDevType(@FormParam("devType") String devType) throws Exception { - Map resultMap = new HashMap(); - String msg = ""; - PgDeviceTypeDto pgDeviceTypeDto=null; - try { - PgDeviceType pgDeviceType = pgDeviceTypeManager.getPgDeviceTypeByDevType(devType); - pgDeviceTypeDto=new PgDeviceTypeDto(pgDeviceType); - msg = "获取成功"; - } catch (Exception e) { - msg = "获取失败"; - e.printStackTrace(); - } - resultMap.put("msg", msg); - resultMap.put("result", pgDeviceTypeDto); - return resultMap; - } - - /** * 获取设备类型 */ @POST @@ -81,4 +58,43 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDeviceType") + @Produces(MediaType.APPLICATION_JSON) + public Map addDeviceType(@FormParam("devType") String devType) + throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + if (pgDeviceTypeManager.getPgDeviceTypeByDevType(devType)!=null) { + result = "false"; + msg = "已存在同名设备类型"; + } else { + PgDeviceType pgDeviceType=new PgDeviceType(); + pgDeviceType.setDevType(devType); + pgDeviceType.setActive(1); + + pgDeviceTypeManager.save(pgDeviceType); + result = "true"; + msg = "保存成功"; + } + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + + return resultMap; + } + } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index e2dbc1c..0000000 --- "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" deleted file mode 100644 index 293a96b..0000000 --- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index 7b9e5fd..ce1b74f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -45,7 +45,7 @@ String msg=""; List pgAlarmTypeDtoList=new ArrayList(); try { - pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto(); if(pgAlarmTypeDtoList.size()==0) msg="没有报警类型信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 7e587a1..36a4fc5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -116,7 +116,7 @@ @POST @Path("addDevice") @Produces(MediaType.APPLICATION_JSON) - public Map addLog(@FormParam("devType") String devType, + public Map addDevice(@FormParam("devType") String devType, @FormParam("devCode") String devCode, @FormParam("devName") String devName, @FormParam("brand") String brand, diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b872eb4..756894f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -34,29 +34,6 @@ } /** - * - */ - @POST - @Path("getPgDeviceTypeByDevType") - @Produces(MediaType.APPLICATION_JSON) - public Map getPgDeviceTypeByDevType(@FormParam("devType") String devType) throws Exception { - Map resultMap = new HashMap(); - String msg = ""; - PgDeviceTypeDto pgDeviceTypeDto=null; - try { - PgDeviceType pgDeviceType = pgDeviceTypeManager.getPgDeviceTypeByDevType(devType); - pgDeviceTypeDto=new PgDeviceTypeDto(pgDeviceType); - msg = "获取成功"; - } catch (Exception e) { - msg = "获取失败"; - e.printStackTrace(); - } - resultMap.put("msg", msg); - resultMap.put("result", pgDeviceTypeDto); - return resultMap; - } - - /** * 获取设备类型 */ @POST @@ -81,4 +58,43 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDeviceType") + @Produces(MediaType.APPLICATION_JSON) + public Map addDeviceType(@FormParam("devType") String devType) + throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + if (pgDeviceTypeManager.getPgDeviceTypeByDevType(devType)!=null) { + result = "false"; + msg = "已存在同名设备类型"; + } else { + PgDeviceType pgDeviceType=new PgDeviceType(); + pgDeviceType.setDevType(devType); + pgDeviceType.setActive(1); + + pgDeviceTypeManager.save(pgDeviceType); + result = "true"; + msg = "保存成功"; + } + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + + return resultMap; + } + } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index e2dbc1c..0000000 --- "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" deleted file mode 100644 index 293a96b..0000000 --- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git a/~WRL0642.tmp b/~WRL0642.tmp deleted file mode 100644 index c054d61..0000000 --- a/~WRL0642.tmp +++ /dev/null Binary files differ diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index 7b9e5fd..ce1b74f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -45,7 +45,7 @@ String msg=""; List pgAlarmTypeDtoList=new ArrayList(); try { - pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto(); if(pgAlarmTypeDtoList.size()==0) msg="没有报警类型信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 7e587a1..36a4fc5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -116,7 +116,7 @@ @POST @Path("addDevice") @Produces(MediaType.APPLICATION_JSON) - public Map addLog(@FormParam("devType") String devType, + public Map addDevice(@FormParam("devType") String devType, @FormParam("devCode") String devCode, @FormParam("devName") String devName, @FormParam("brand") String brand, diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b872eb4..756894f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -34,29 +34,6 @@ } /** - * - */ - @POST - @Path("getPgDeviceTypeByDevType") - @Produces(MediaType.APPLICATION_JSON) - public Map getPgDeviceTypeByDevType(@FormParam("devType") String devType) throws Exception { - Map resultMap = new HashMap(); - String msg = ""; - PgDeviceTypeDto pgDeviceTypeDto=null; - try { - PgDeviceType pgDeviceType = pgDeviceTypeManager.getPgDeviceTypeByDevType(devType); - pgDeviceTypeDto=new PgDeviceTypeDto(pgDeviceType); - msg = "获取成功"; - } catch (Exception e) { - msg = "获取失败"; - e.printStackTrace(); - } - resultMap.put("msg", msg); - resultMap.put("result", pgDeviceTypeDto); - return resultMap; - } - - /** * 获取设备类型 */ @POST @@ -81,4 +58,43 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDeviceType") + @Produces(MediaType.APPLICATION_JSON) + public Map addDeviceType(@FormParam("devType") String devType) + throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + if (pgDeviceTypeManager.getPgDeviceTypeByDevType(devType)!=null) { + result = "false"; + msg = "已存在同名设备类型"; + } else { + PgDeviceType pgDeviceType=new PgDeviceType(); + pgDeviceType.setDevType(devType); + pgDeviceType.setActive(1); + + pgDeviceTypeManager.save(pgDeviceType); + result = "true"; + msg = "保存成功"; + } + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + + return resultMap; + } + } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index e2dbc1c..0000000 --- "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" deleted file mode 100644 index 293a96b..0000000 --- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git a/~WRL0642.tmp b/~WRL0642.tmp deleted file mode 100644 index c054d61..0000000 --- a/~WRL0642.tmp +++ /dev/null Binary files differ diff --git a/~WRL1548.tmp b/~WRL1548.tmp deleted file mode 100644 index 0bb6284..0000000 --- a/~WRL1548.tmp +++ /dev/null Binary files differ diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java new file mode 100644 index 0000000..3580d92 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCh4.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CH4") +@SequenceGenerator(name = "SEQ_PG_CH4_ID", sequenceName = "SEQ_PG_CH4_ID",allocationSize=1,initialValue=1) +public class PgCh4 implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String ch4; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CH4_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CH4") + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java new file mode 100644 index 0000000..e5989e5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgCo.java @@ -0,0 +1,74 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_CO") +@SequenceGenerator(name = "SEQ_PG_CO_ID", sequenceName = "SEQ_PG_CO_ID",allocationSize=1,initialValue=1) +public class PgCo implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String co; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_CO_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "CO") + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java new file mode 100644 index 0000000..b56058f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgO2.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_O2") +@SequenceGenerator(name = "SEQ_PG_O2_ID", sequenceName = "SEQ_PG_O2_ID",allocationSize=1,initialValue=1) +public class PgO2 implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String O2; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_O2_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "O2") + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java new file mode 100644 index 0000000..aff4181 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgSh.java @@ -0,0 +1,73 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_Sh") +@SequenceGenerator(name = "SEQ_PG_Sh_ID", sequenceName = "SEQ_PG_Sh_ID",allocationSize=1,initialValue=1) +public class PgSh implements Serializable { + private static final long serialVersionUID = 1L; + private long id; + private String sh; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_Sh_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "SH") + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java new file mode 100644 index 0000000..7370537 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/domain/PgTempHum.java @@ -0,0 +1,84 @@ +package com.casic.PgInterface.devData.domain; + +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +/** + * Created by yxw on 2017/11/28. + */ +@Entity +@Table(name = "PG_TEMPHUM") +@SequenceGenerator(name = "SEQ_PG_TEMPHUM_ID", sequenceName = "SEQ_PG_TEMPHUM_ID",allocationSize=1,initialValue=1) +public class PgTempHum implements Serializable { + + private static final long serialVersionUID = 1L; + private long id; + private String temp; + private String hum; + private Date logTime; + private Date upTime; + private PgDevice pgDeviceId; + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_TEMPHUM_ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Column(name = "TEMP") + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + @Column(name = "HUM") + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + @Column(name = "LOGTIME") + public Date getLogTime() { + return logTime; + } + + public void setLogTime(Date logTime) { + this.logTime = logTime; + } + + @Column(name = "UPTIME") + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } + + @ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST}) + @NotFound(action = NotFoundAction.IGNORE) + @JoinColumn(name = "PGDEVICEID") + public PgDevice getPgDeviceId() { + return pgDeviceId; + } + + public void setPgDeviceId(PgDevice pgDeviceId) { + this.pgDeviceId = pgDeviceId; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java new file mode 100644 index 0000000..e9adce6 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCh4; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCh4Dto implements Serializable { + + private String id; + private String ch4; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCh4() { + return ch4; + } + + public void setCh4(String ch4) { + this.ch4 = ch4; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCh4Dto(PgCh4 pgCh4) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCh4.getId())); + this.setCh4(pgCh4.getCh4()); + this.setLogTime(sdf.format(pgCh4.getLogTime())); + this.setUpTime(sdf.format(pgCh4.getUpTime())); + this.setDevCode(pgCh4.getPgDeviceId().getDevCode()); + this.setDevName(pgCh4.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java new file mode 100644 index 0000000..2531ea1 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgCo; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgCoDto implements Serializable { + + private String id; + private String co; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getCo() { + return co; + } + + public void setCo(String co) { + this.co = co; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgCoDto(PgCo pgCo) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgCo.getId())); + this.setCo(pgCo.getCo()); + this.setLogTime(sdf.format(pgCo.getLogTime())); + this.setUpTime(sdf.format(pgCo.getUpTime())); + this.setDevCode(pgCo.getPgDeviceId().getDevCode()); + this.setDevName(pgCo.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java new file mode 100644 index 0000000..1b506b3 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -0,0 +1,80 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgO2; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgO2Dto implements Serializable { + + private String id; + private String O2; + private String logTime; + private String upTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getO2() { + return O2; + } + + public void setO2(String o2) { + O2 = o2; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgO2Dto (PgO2 pgO2) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgO2.getId())); + this.setO2(pgO2.getO2()); + this.setUpTime(sdf.format(pgO2.getUpTime())); + this.setLogTime(sdf.format(pgO2.getLogTime())); + this.setDevCode(pgO2.getPgDeviceId().getDevCode()); + this.setDevName(pgO2.getPgDeviceId().getDevName()); + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java new file mode 100644 index 0000000..8775ac5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -0,0 +1,79 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgSh; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgShDto implements Serializable { + + private String id; + private String sh; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSh() { + return sh; + } + + public void setSh(String sh) { + this.sh = sh; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgShDto(PgSh pgSh) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgSh.getId())); + this.setSh(pgSh.getSh()); + this.setUpTime(sdf.format(pgSh.getUpTime())); + this.setLogTime(sdf.format(pgSh.getLogTime())); + this.setDevCode(pgSh.getPgDeviceId().getDevCode()); + this.setDevName(pgSh.getPgDeviceId().getDevName()); + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java new file mode 100644 index 0000000..271cb7a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -0,0 +1,90 @@ +package com.casic.PgInterface.devData.dto; + +import com.casic.PgInterface.devData.domain.PgTempHum; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by yxw on 2017/11/28. + */ +public class PgTempHumDto implements Serializable { + + private String id; + private String temp; + private String hum; + private String upTime; + private String logTime; + private String devCode; + private String devName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getLogTime() { + return logTime; + } + + public void setLogTime(String logTime) { + this.logTime = logTime; + } + + public String getDevCode() { + return devCode; + } + + public void setDevCode(String devCode) { + this.devCode = devCode; + } + + public String getDevName() { + return devName; + } + + public void setDevName(String devName) { + this.devName = devName; + } + + public PgTempHumDto(PgTempHum pgTempHum) + { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + this.setId(String.valueOf(pgTempHum.getId())); + this.setHum(pgTempHum.getHum()); + this.setTemp(pgTempHum.getTemp()); + this.setLogTime(sdf.format(pgTempHum.getLogTime())); + this.setUpTime(sdf.format(pgTempHum.getUpTime())); + this.setDevCode(pgTempHum.getPgDeviceId().getDevCode()); + this.setDevName(pgTempHum.getPgDeviceId().getDevName()); + + } +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java new file mode 100644 index 0000000..17255f8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCh4; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCh4Manager extends HibernateEntityDao { + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java new file mode 100644 index 0000000..d5a160a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgCo; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgCoManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java new file mode 100644 index 0000000..62e762f --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgO2; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgO2Manager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java new file mode 100644 index 0000000..dd910df --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgSh; +import org.springframework.stereotype.Service; + +/** + * Created by yxw on 2017/11/28. + */ +@Service +public class PgShManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java new file mode 100644 index 0000000..99d902a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -0,0 +1,12 @@ +package com.casic.PgInterface.devData.manager; + +/** + * Created by yxw on 2017/11/28. + */ + +import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.devData.domain.PgTempHum; +import org.springframework.stereotype.Service; +@Service +public class PgTempHumManager extends HibernateEntityDao { +} diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java index e75204e..9951bcd 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.devTable.domain; -import com.casic.PgInterface.devData.domain.PgSenseDev; +import com.casic.PgInterface.devData.domain.*; import org.hibernate.annotations.NotFound; import org.hibernate.annotations.NotFoundAction; @@ -30,6 +30,11 @@ private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 private List pgSenseDevs;// + private List pgTempHums;//温湿度 + private List pgCos;//一氧化碳 + private List pgO2s;//氧气 + private List pgCh4s;//甲烷 + private List pgShs;//硫化氢 @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_DEVICE_ID") @@ -144,4 +149,49 @@ this.pgSenseDevs = pgSenseDevs; } + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgTempHums() { + return pgTempHums; + } + + public void setPgTempHums(List pgTempHums) { + this.pgTempHums = pgTempHums; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCos() { + return pgCos; + } + + public void setPgCos(List pgCos) { + this.pgCos = pgCos; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgO2s() { + return pgO2s; + } + + public void setPgO2s(List pgO2s) { + this.pgO2s = pgO2s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgCh4s() { + return pgCh4s; + } + + public void setPgCh4s(List pgCh4s) { + this.pgCh4s = pgCh4s; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") + public List getPgShs() { + return pgShs; + } + + public void setPgShs(List pgShs) { + this.pgShs = pgShs; + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java index 22bca34..4278dc1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDeviceType.java @@ -15,7 +15,7 @@ private long id; private String devType; - private String active; + private int active; private List pgDeviceList; @Id @@ -38,11 +38,11 @@ } @Column(name = "ACTIVE") - public String getActive() { + public int getActive() { return active; } - public void setActive(String active) { + public void setActive(int active) { this.active = active; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index c8a4c18..b4048d9 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -21,7 +21,6 @@ private String phoneNumber;//联系电话 private String active;//状态 - public String getId() { return id; } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 3ca0260..c1548e0 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -41,7 +41,7 @@ { this.setId(String.valueOf(pgDeviceType.getId())); this.setDevType(pgDeviceType.getDevType()); - this.setActive(pgDeviceType.getActive()); + this.setActive(String.valueOf(pgDeviceType.getActive())); } diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java index 3df56e8..0c2d208 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -2,14 +2,20 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.devTable.domain.PgAlarm; -import com.casic.PgInterface.devTable.dto.PgAlarmDto; +import com.casic.PgInterface.devTable.domain.PgAlarmType; +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import org.hibernate.Query; +import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.List; /** * Created by yxw on 2017/11/22. */ +@Service public class PgAlarmTjManager extends HibernateEntityDao { private PgAlarmTypeManager pgAlarmTypeManager; @@ -20,33 +26,42 @@ } // - public List getAlarmAmongDate(String startDate,String endDate) throws Exception { + public List getAlarmTjResultByType() throws Exception { - /* + List pgAlarmTjDtoList=new ArrayList(); + PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String hql=""; - Criteria criteria = createCriteria(PgAlarm.class); - criteria.add(Restrictions.eq("active", 1)); - criteria.addOrder(Order.desc("id")); - - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("alarmDate", sdf.parse(startDate))); + for(int i=0;i paraMap = new HashMap(); - String hql = " select count(pgAlarm),pgAlarm.alarmType from PG_ALARM pgAlarm GROUP BY pgAlarm.alarmType"; - - this.createQuery(hql, paraMap).list(); - -*/ - return null; + return pgAlarmTjDtoList; } + /* + public Map getAlarmTjByAlarmType() throws Exception + { + List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + Session session=this.getSession(); + String sql=""; + + for(int i=0;i { //获取当前报警类型列表 - public List getAllAlarmType() { + public List getAllAlarmTypeDto() { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("active", 1)); criteria.addOrder(Order.desc("id")); @@ -32,6 +32,17 @@ return pgAlarmTypeDtoList; } + public List getAllAlarmType() { + Criteria criteria = createCriteria(PgAlarmType.class); + criteria.add(Restrictions.eq("active", 1)); + criteria.addOrder(Order.desc("id")); + + List pgAlarmTypeList = criteria.list(); + + return pgAlarmTypeList; + } + + public PgAlarmType getAlarmTypeByAlarmType(String alarmType) { Criteria criteria = createCriteria(PgAlarmType.class); criteria.add(Restrictions.eq("alarmType", alarmType)); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java index 874647f..9d17fb1 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRs.java @@ -2,7 +2,6 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; import com.casic.PgInterface.devTable.dto.PgAlarmDto; -import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; import com.casic.PgInterface.devTable.manager.PgAlarmManager; import com.casic.PgInterface.devTable.manager.PgAlarmTypeManager; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -10,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; + import javax.annotation.Resource; import javax.ws.rs.FormParam; import javax.ws.rs.POST; @@ -149,6 +149,7 @@ pgAlarm.setDescription(description); pgAlarm.setPatrolerId(pgPatrolerManager.getPatrolerByuserName(userName)); pgAlarm.setAlarmDevId(pgDeviceManager.getDeviceBydevCode(devCode)); + pgAlarm.setActive(1); logger.info("成功保存"); pgAlarmManager.save(pgAlarm); @@ -166,31 +167,7 @@ return resultMap; } - /** - * 历史报警统计 - */ - @POST - @Path("getAlarmTypeCountAmongDate") - @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, - @FormParam("endDate") String endDate)throws Exception{ - Map resultMap = new HashMap(); - String result = ""; - String msg = ""; - try{ - List pgAlarmTjDtoList=new ArrayList(); - } - catch(Exception ex) - { - result="false"; - msg="统计失败"; - } - resultMap.put("result",result); - resultMap.put("msg",msg); - return resultMap; - } - } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java new file mode 100644 index 0000000..831b021 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -0,0 +1,89 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; +import com.casic.PgInterface.devTable.manager.PgAlarmTjManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import javax.ws.rs.FormParam; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by yxw on 2017/11/24. + */ +@Component +@Path("pgAlarmTj") +public class PgAlarmTjRs { + + private static Logger logger = LoggerFactory.getLogger(PgAlarmRs.class); + + private PgAlarmTjManager pgAlarmTjManager; + + @Resource + public void setPgAlarmTjManager(PgAlarmTjManager pgAlarmTjManager) { + this.pgAlarmTjManager = pgAlarmTjManager; + } + + /** + * 按类型统计历史报警记录 + */ + @POST + @Path("getAlarmTypeTjResult") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTypeTjResult()throws Exception{ + Map resultMap = new HashMap(); + String msg = ""; + List pgAlarmTjDtoList=null; + try{ + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + msg="获取成功"; + } + catch(Exception ex) { + msg = "统计失败"; + } + resultMap.put("result",pgAlarmTjDtoList); + resultMap.put("msg",msg); + return resultMap; + } + + /** + * 历史报警统计 + */ + @POST + @Path("getAlarmTypeCountAmongDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + try{ + List pgAlarmTjDtoList=new ArrayList(); + + + + } + catch(Exception ex) + { + result="false"; + msg="统计失败"; + } + resultMap.put("result",result); + resultMap.put("msg",msg); + return resultMap; + } + + + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java index 7b9e5fd..ce1b74f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTypeRs.java @@ -45,7 +45,7 @@ String msg=""; List pgAlarmTypeDtoList=new ArrayList(); try { - pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); + pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmTypeDto(); if(pgAlarmTypeDtoList.size()==0) msg="没有报警类型信息"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java index 7e587a1..36a4fc5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceRs.java @@ -116,7 +116,7 @@ @POST @Path("addDevice") @Produces(MediaType.APPLICATION_JSON) - public Map addLog(@FormParam("devType") String devType, + public Map addDevice(@FormParam("devType") String devType, @FormParam("devCode") String devCode, @FormParam("devName") String devName, @FormParam("brand") String brand, diff --git a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java index b872eb4..756894f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgDeviceTypeRs.java @@ -34,29 +34,6 @@ } /** - * - */ - @POST - @Path("getPgDeviceTypeByDevType") - @Produces(MediaType.APPLICATION_JSON) - public Map getPgDeviceTypeByDevType(@FormParam("devType") String devType) throws Exception { - Map resultMap = new HashMap(); - String msg = ""; - PgDeviceTypeDto pgDeviceTypeDto=null; - try { - PgDeviceType pgDeviceType = pgDeviceTypeManager.getPgDeviceTypeByDevType(devType); - pgDeviceTypeDto=new PgDeviceTypeDto(pgDeviceType); - msg = "获取成功"; - } catch (Exception e) { - msg = "获取失败"; - e.printStackTrace(); - } - resultMap.put("msg", msg); - resultMap.put("result", pgDeviceTypeDto); - return resultMap; - } - - /** * 获取设备类型 */ @POST @@ -81,4 +58,43 @@ return resultMap; } + /** + * 新增设备 + */ + @POST + @Path("addDeviceType") + @Produces(MediaType.APPLICATION_JSON) + public Map addDeviceType(@FormParam("devType") String devType) + throws Exception { + + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + try { + if (pgDeviceTypeManager.getPgDeviceTypeByDevType(devType)!=null) { + result = "false"; + msg = "已存在同名设备类型"; + } else { + PgDeviceType pgDeviceType=new PgDeviceType(); + pgDeviceType.setDevType(devType); + pgDeviceType.setActive(1); + + pgDeviceTypeManager.save(pgDeviceType); + result = "true"; + msg = "保存成功"; + } + + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("success", result); + resultMap.put("msg", msg); + + return resultMap; + } + } diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" deleted file mode 100644 index e2dbc1c..0000000 --- "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" deleted file mode 100644 index 293a96b..0000000 --- "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ /dev/null Binary files differ diff --git a/~WRL0642.tmp b/~WRL0642.tmp deleted file mode 100644 index c054d61..0000000 --- a/~WRL0642.tmp +++ /dev/null Binary files differ diff --git a/~WRL1548.tmp b/~WRL1548.tmp deleted file mode 100644 index 0bb6284..0000000 --- a/~WRL1548.tmp +++ /dev/null Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" index f0d98f0..815a40c 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ