diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java new file mode 100644 index 0000000..0bbfdc2 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -0,0 +1,118 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.manager.PgCoManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCo") +public class PgCoRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgCoManager pgCoManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCoManager(PgCoManager pgCoManager) { + this.pgCoManager = pgCoManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCoInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCoDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgCoDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCoData") + @Produces(MediaType.APPLICATION_JSON) + public Map addCoData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("co") String co)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCo pgCo=new PgCo(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCo.setCo(co); + pgCo.setLogTime(new Date()); + pgCo.setUpTime(sdf.parse(upTime)); + pgCo.setPgDeviceId(pgDevice); + + pgCoManager.save(pgCo); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java new file mode 100644 index 0000000..0bbfdc2 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -0,0 +1,118 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.manager.PgCoManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCo") +public class PgCoRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgCoManager pgCoManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCoManager(PgCoManager pgCoManager) { + this.pgCoManager = pgCoManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCoInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCoDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgCoDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCoData") + @Produces(MediaType.APPLICATION_JSON) + public Map addCoData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("co") String co)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCo pgCo=new PgCo(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCo.setCo(co); + pgCo.setLogTime(new Date()); + pgCo.setUpTime(sdf.parse(upTime)); + pgCo.setPgDeviceId(pgDevice); + + pgCoManager.save(pgCo); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index 66d0822..ea3ec08 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -8,17 +8,14 @@ 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.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2017/11/4. @@ -50,11 +47,10 @@ @Path("addLog") @Produces(MediaType.APPLICATION_JSON) public Map addLog(@FormParam("userName") String userName, - @FormParam("operate") String operate, - @FormParam("operateTime") String operateTime) + @FormParam("operate") String operate) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map resultMap = new HashMap(); String result = ""; @@ -66,7 +62,7 @@ pgLog.setPatrolerId(pgPatroler); pgLog.setOperate(operate); - pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setOperateTime(new Date()); pgLog.setActive(1); pgLogManager.save(pgLog); diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java new file mode 100644 index 0000000..0bbfdc2 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -0,0 +1,118 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.manager.PgCoManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCo") +public class PgCoRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgCoManager pgCoManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCoManager(PgCoManager pgCoManager) { + this.pgCoManager = pgCoManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCoInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCoDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgCoDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCoData") + @Produces(MediaType.APPLICATION_JSON) + public Map addCoData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("co") String co)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCo pgCo=new PgCo(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCo.setCo(co); + pgCo.setLogTime(new Date()); + pgCo.setUpTime(sdf.parse(upTime)); + pgCo.setPgDeviceId(pgDevice); + + pgCoManager.save(pgCo); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index 66d0822..ea3ec08 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -8,17 +8,14 @@ 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.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2017/11/4. @@ -50,11 +47,10 @@ @Path("addLog") @Produces(MediaType.APPLICATION_JSON) public Map addLog(@FormParam("userName") String userName, - @FormParam("operate") String operate, - @FormParam("operateTime") String operateTime) + @FormParam("operate") String operate) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map resultMap = new HashMap(); String result = ""; @@ -66,7 +62,7 @@ pgLog.setPatrolerId(pgPatroler); pgLog.setOperate(operate); - pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setOperateTime(new Date()); pgLog.setActive(1); pgLogManager.save(pgLog); diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java new file mode 100644 index 0000000..691cf44 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devData.manager.PgO2Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgO2") +public class PgO2Rs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgO2Manager pgO2Manager; + + @Resource + public void setPgO2Manager(PgO2Manager pgO2Manager) { + this.pgO2Manager = pgO2Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getO2InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getO2InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgO2DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgO2DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addO2Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addO2Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("o2") String o2)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgO2 pgO2=new PgO2(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgO2.setO2(o2); + pgO2.setLogTime(new Date()); + pgO2.setUpTime(sdf.parse(upTime)); + pgO2.setPgDeviceId(pgDevice); + + pgO2Manager.save(pgO2); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java new file mode 100644 index 0000000..0bbfdc2 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -0,0 +1,118 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.manager.PgCoManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCo") +public class PgCoRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgCoManager pgCoManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCoManager(PgCoManager pgCoManager) { + this.pgCoManager = pgCoManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCoInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCoDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgCoDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCoData") + @Produces(MediaType.APPLICATION_JSON) + public Map addCoData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("co") String co)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCo pgCo=new PgCo(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCo.setCo(co); + pgCo.setLogTime(new Date()); + pgCo.setUpTime(sdf.parse(upTime)); + pgCo.setPgDeviceId(pgDevice); + + pgCoManager.save(pgCo); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index 66d0822..ea3ec08 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -8,17 +8,14 @@ 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.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2017/11/4. @@ -50,11 +47,10 @@ @Path("addLog") @Produces(MediaType.APPLICATION_JSON) public Map addLog(@FormParam("userName") String userName, - @FormParam("operate") String operate, - @FormParam("operateTime") String operateTime) + @FormParam("operate") String operate) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map resultMap = new HashMap(); String result = ""; @@ -66,7 +62,7 @@ pgLog.setPatrolerId(pgPatroler); pgLog.setOperate(operate); - pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setOperateTime(new Date()); pgLog.setActive(1); pgLogManager.save(pgLog); diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java new file mode 100644 index 0000000..691cf44 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devData.manager.PgO2Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgO2") +public class PgO2Rs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgO2Manager pgO2Manager; + + @Resource + public void setPgO2Manager(PgO2Manager pgO2Manager) { + this.pgO2Manager = pgO2Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getO2InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getO2InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgO2DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgO2DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addO2Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addO2Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("o2") String o2)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgO2 pgO2=new PgO2(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgO2.setO2(o2); + pgO2.setLogTime(new Date()); + pgO2.setUpTime(sdf.parse(upTime)); + pgO2.setPgDeviceId(pgDevice); + + pgO2Manager.save(pgO2); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java deleted file mode 100644 index 4ca31a3..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devData.manager.PgSenseDevManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; -import com.casic.PgInterface.devTable.manager.PipeGalleryManager; -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.HashMap; -import java.util.Map; - -/** - * Created by yxw on 2017/11/3. - */ -@Component -@Path("pgSenseDev") -public class PgSenseDevRs { - private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); - - private PgSenseDevManager pgSenseDevManager; - - private PipeGalleryManager pipeGalleryManager; - - private PgPartitionManager pgPartitionManager; - - @Resource - public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { - this.pgSenseDevManager = pgSenseDevManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - /** - * 查询监测数据 - */ - @POST - @Path("getSenseDataByRegion") - @Produces(MediaType.APPLICATION_JSON) - public Map getSenseData(@FormParam("pgName") String pgName, - @FormParam("parName") String parName) - throws Exception { - Map resultMap = new HashMap(); - - - - - - return resultMap; - } - - - -} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java new file mode 100644 index 0000000..0bbfdc2 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -0,0 +1,118 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.manager.PgCoManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCo") +public class PgCoRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgCoManager pgCoManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCoManager(PgCoManager pgCoManager) { + this.pgCoManager = pgCoManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCoInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCoDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgCoDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCoData") + @Produces(MediaType.APPLICATION_JSON) + public Map addCoData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("co") String co)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCo pgCo=new PgCo(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCo.setCo(co); + pgCo.setLogTime(new Date()); + pgCo.setUpTime(sdf.parse(upTime)); + pgCo.setPgDeviceId(pgDevice); + + pgCoManager.save(pgCo); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index 66d0822..ea3ec08 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -8,17 +8,14 @@ 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.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2017/11/4. @@ -50,11 +47,10 @@ @Path("addLog") @Produces(MediaType.APPLICATION_JSON) public Map addLog(@FormParam("userName") String userName, - @FormParam("operate") String operate, - @FormParam("operateTime") String operateTime) + @FormParam("operate") String operate) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map resultMap = new HashMap(); String result = ""; @@ -66,7 +62,7 @@ pgLog.setPatrolerId(pgPatroler); pgLog.setOperate(operate); - pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setOperateTime(new Date()); pgLog.setActive(1); pgLogManager.save(pgLog); diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java new file mode 100644 index 0000000..691cf44 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devData.manager.PgO2Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgO2") +public class PgO2Rs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgO2Manager pgO2Manager; + + @Resource + public void setPgO2Manager(PgO2Manager pgO2Manager) { + this.pgO2Manager = pgO2Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getO2InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getO2InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgO2DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgO2DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addO2Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addO2Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("o2") String o2)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgO2 pgO2=new PgO2(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgO2.setO2(o2); + pgO2.setLogTime(new Date()); + pgO2.setUpTime(sdf.parse(upTime)); + pgO2.setPgDeviceId(pgDevice); + + pgO2Manager.save(pgO2); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java deleted file mode 100644 index 4ca31a3..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devData.manager.PgSenseDevManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; -import com.casic.PgInterface.devTable.manager.PipeGalleryManager; -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.HashMap; -import java.util.Map; - -/** - * Created by yxw on 2017/11/3. - */ -@Component -@Path("pgSenseDev") -public class PgSenseDevRs { - private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); - - private PgSenseDevManager pgSenseDevManager; - - private PipeGalleryManager pipeGalleryManager; - - private PgPartitionManager pgPartitionManager; - - @Resource - public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { - this.pgSenseDevManager = pgSenseDevManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - /** - * 查询监测数据 - */ - @POST - @Path("getSenseDataByRegion") - @Produces(MediaType.APPLICATION_JSON) - public Map getSenseData(@FormParam("pgName") String pgName, - @FormParam("parName") String parName) - throws Exception { - Map resultMap = new HashMap(); - - - - - - return resultMap; - } - - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java new file mode 100644 index 0000000..673612b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devData.manager.PgShManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgSh") +public class PgShRs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgShManager pgShManager; + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgShManager(PgShManager pgShManager) { + this.pgShManager = pgShManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getShInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getShInfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgShDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgShDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate); + if(pgShDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgShDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addShData") + @Produces(MediaType.APPLICATION_JSON) + public Map addShData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("sh") String sh)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgSh pgSh=new PgSh(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgSh.setSh(sh); + pgSh.setLogTime(new Date()); + pgSh.setUpTime(sdf.parse(upTime)); + pgSh.setPgDeviceId(pgDevice); + + pgShManager.save(pgSh); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java new file mode 100644 index 0000000..0bbfdc2 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -0,0 +1,118 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.manager.PgCoManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCo") +public class PgCoRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgCoManager pgCoManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCoManager(PgCoManager pgCoManager) { + this.pgCoManager = pgCoManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCoInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCoDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgCoDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCoData") + @Produces(MediaType.APPLICATION_JSON) + public Map addCoData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("co") String co)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCo pgCo=new PgCo(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCo.setCo(co); + pgCo.setLogTime(new Date()); + pgCo.setUpTime(sdf.parse(upTime)); + pgCo.setPgDeviceId(pgDevice); + + pgCoManager.save(pgCo); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index 66d0822..ea3ec08 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -8,17 +8,14 @@ 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.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2017/11/4. @@ -50,11 +47,10 @@ @Path("addLog") @Produces(MediaType.APPLICATION_JSON) public Map addLog(@FormParam("userName") String userName, - @FormParam("operate") String operate, - @FormParam("operateTime") String operateTime) + @FormParam("operate") String operate) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map resultMap = new HashMap(); String result = ""; @@ -66,7 +62,7 @@ pgLog.setPatrolerId(pgPatroler); pgLog.setOperate(operate); - pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setOperateTime(new Date()); pgLog.setActive(1); pgLogManager.save(pgLog); diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java new file mode 100644 index 0000000..691cf44 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devData.manager.PgO2Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgO2") +public class PgO2Rs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgO2Manager pgO2Manager; + + @Resource + public void setPgO2Manager(PgO2Manager pgO2Manager) { + this.pgO2Manager = pgO2Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getO2InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getO2InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgO2DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgO2DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addO2Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addO2Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("o2") String o2)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgO2 pgO2=new PgO2(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgO2.setO2(o2); + pgO2.setLogTime(new Date()); + pgO2.setUpTime(sdf.parse(upTime)); + pgO2.setPgDeviceId(pgDevice); + + pgO2Manager.save(pgO2); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java deleted file mode 100644 index 4ca31a3..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devData.manager.PgSenseDevManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; -import com.casic.PgInterface.devTable.manager.PipeGalleryManager; -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.HashMap; -import java.util.Map; - -/** - * Created by yxw on 2017/11/3. - */ -@Component -@Path("pgSenseDev") -public class PgSenseDevRs { - private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); - - private PgSenseDevManager pgSenseDevManager; - - private PipeGalleryManager pipeGalleryManager; - - private PgPartitionManager pgPartitionManager; - - @Resource - public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { - this.pgSenseDevManager = pgSenseDevManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - /** - * 查询监测数据 - */ - @POST - @Path("getSenseDataByRegion") - @Produces(MediaType.APPLICATION_JSON) - public Map getSenseData(@FormParam("pgName") String pgName, - @FormParam("parName") String parName) - throws Exception { - Map resultMap = new HashMap(); - - - - - - return resultMap; - } - - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java new file mode 100644 index 0000000..673612b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devData.manager.PgShManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgSh") +public class PgShRs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgShManager pgShManager; + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgShManager(PgShManager pgShManager) { + this.pgShManager = pgShManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getShInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getShInfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgShDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgShDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate); + if(pgShDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgShDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addShData") + @Produces(MediaType.APPLICATION_JSON) + public Map addShData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("sh") String sh)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgSh pgSh=new PgSh(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgSh.setSh(sh); + pgSh.setLogTime(new Date()); + pgSh.setUpTime(sdf.parse(upTime)); + pgSh.setPgDeviceId(pgDevice); + + pgShManager.save(pgSh); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java new file mode 100644 index 0000000..a5ae51e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devData.manager.PgTempHumManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgTempHum") +public class PgTempHumRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgDeviceManager pgDeviceManager; + + private PgTempHumManager pgTempHumManager; + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgTempHumManager(PgTempHumManager pgTempHumManager) { + this.pgTempHumManager = pgTempHumManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getTempHumInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getTempHumInfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgTempHumDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgTempHumDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate); + if(pgTempHumDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgTempHumDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addTempHumData") + @Produces(MediaType.APPLICATION_JSON) + public Map addTempHumData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("temp") String temp, + @FormParam("hum") String hum)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgTempHum pgTempHum=new PgTempHum(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgTempHum.setTemp(temp); + pgTempHum.setHum(hum); + pgTempHum.setLogTime(new Date()); + pgTempHum.setUpTime(sdf.parse(upTime)); + pgTempHum.setPgDeviceId(pgDevice); + + pgTempHumManager.save(pgTempHum); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java new file mode 100644 index 0000000..0bbfdc2 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -0,0 +1,118 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.manager.PgCoManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCo") +public class PgCoRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgCoManager pgCoManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCoManager(PgCoManager pgCoManager) { + this.pgCoManager = pgCoManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCoInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCoDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgCoDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCoData") + @Produces(MediaType.APPLICATION_JSON) + public Map addCoData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("co") String co)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCo pgCo=new PgCo(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCo.setCo(co); + pgCo.setLogTime(new Date()); + pgCo.setUpTime(sdf.parse(upTime)); + pgCo.setPgDeviceId(pgDevice); + + pgCoManager.save(pgCo); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index 66d0822..ea3ec08 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -8,17 +8,14 @@ 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.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2017/11/4. @@ -50,11 +47,10 @@ @Path("addLog") @Produces(MediaType.APPLICATION_JSON) public Map addLog(@FormParam("userName") String userName, - @FormParam("operate") String operate, - @FormParam("operateTime") String operateTime) + @FormParam("operate") String operate) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map resultMap = new HashMap(); String result = ""; @@ -66,7 +62,7 @@ pgLog.setPatrolerId(pgPatroler); pgLog.setOperate(operate); - pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setOperateTime(new Date()); pgLog.setActive(1); pgLogManager.save(pgLog); diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java new file mode 100644 index 0000000..691cf44 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devData.manager.PgO2Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgO2") +public class PgO2Rs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgO2Manager pgO2Manager; + + @Resource + public void setPgO2Manager(PgO2Manager pgO2Manager) { + this.pgO2Manager = pgO2Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getO2InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getO2InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgO2DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgO2DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addO2Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addO2Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("o2") String o2)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgO2 pgO2=new PgO2(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgO2.setO2(o2); + pgO2.setLogTime(new Date()); + pgO2.setUpTime(sdf.parse(upTime)); + pgO2.setPgDeviceId(pgDevice); + + pgO2Manager.save(pgO2); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java deleted file mode 100644 index 4ca31a3..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devData.manager.PgSenseDevManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; -import com.casic.PgInterface.devTable.manager.PipeGalleryManager; -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.HashMap; -import java.util.Map; - -/** - * Created by yxw on 2017/11/3. - */ -@Component -@Path("pgSenseDev") -public class PgSenseDevRs { - private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); - - private PgSenseDevManager pgSenseDevManager; - - private PipeGalleryManager pipeGalleryManager; - - private PgPartitionManager pgPartitionManager; - - @Resource - public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { - this.pgSenseDevManager = pgSenseDevManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - /** - * 查询监测数据 - */ - @POST - @Path("getSenseDataByRegion") - @Produces(MediaType.APPLICATION_JSON) - public Map getSenseData(@FormParam("pgName") String pgName, - @FormParam("parName") String parName) - throws Exception { - Map resultMap = new HashMap(); - - - - - - return resultMap; - } - - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java new file mode 100644 index 0000000..673612b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devData.manager.PgShManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgSh") +public class PgShRs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgShManager pgShManager; + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgShManager(PgShManager pgShManager) { + this.pgShManager = pgShManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getShInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getShInfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgShDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgShDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate); + if(pgShDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgShDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addShData") + @Produces(MediaType.APPLICATION_JSON) + public Map addShData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("sh") String sh)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgSh pgSh=new PgSh(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgSh.setSh(sh); + pgSh.setLogTime(new Date()); + pgSh.setUpTime(sdf.parse(upTime)); + pgSh.setPgDeviceId(pgDevice); + + pgShManager.save(pgSh); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java new file mode 100644 index 0000000..a5ae51e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devData.manager.PgTempHumManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgTempHum") +public class PgTempHumRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgDeviceManager pgDeviceManager; + + private PgTempHumManager pgTempHumManager; + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgTempHumManager(PgTempHumManager pgTempHumManager) { + this.pgTempHumManager = pgTempHumManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getTempHumInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getTempHumInfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgTempHumDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgTempHumDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate); + if(pgTempHumDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgTempHumDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addTempHumData") + @Produces(MediaType.APPLICATION_JSON) + public Map addTempHumData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("temp") String temp, + @FormParam("hum") String hum)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgTempHum pgTempHum=new PgTempHum(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgTempHum.setTemp(temp); + pgTempHum.setHum(hum); + pgTempHum.setLogTime(new Date()); + pgTempHum.setUpTime(sdf.parse(upTime)); + pgTempHum.setPgDeviceId(pgDevice); + + pgTempHumManager.save(pgTempHum); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", 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" index 815a40c..681b604 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 diff --git a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java b/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java deleted file mode 100644 index 074ec6e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/domain/PgSenseDev.java +++ /dev/null @@ -1,104 +0,0 @@ -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/1. - */ -@Entity -@Table(name = "PG_SENSEDEV") -@SequenceGenerator(name = "SEQ_PG_SENSEDEV_ID", sequenceName = "SEQ_PG_SENSEDEV_ID",allocationSize=1,initialValue=1) -public class PgSenseDev implements Serializable { - - private static final long serialVersionUID = 1L; - private long id; - private PgDevice pgDeviceId;//设备 - private Date upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_SENSEDEV_ID") - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - @Column(name = "UPTIME") - public Date getUpTime() { - return upTime; - } - - public void setUpTime(Date upTime) { - this.upTime = upTime; - } - - @Column(name = "TEMPERATURE") - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - @Column(name = "O2") - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - @Column(name = "SH") - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - @Column(name = "CH4") - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - @Column(name = "CO") - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - @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/PgSenseDevDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java deleted file mode 100644 index 80320ec..0000000 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgSenseDevDto.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.casic.PgInterface.devData.dto; - -import com.casic.PgInterface.devData.domain.PgSenseDev; - -import java.io.Serializable; -import java.text.SimpleDateFormat; - -/** - * Created by yxw on 2017/11/2. - */ -public class PgSenseDevDto implements Serializable { - - private String id; - private String deviceName;//设备 - private String upTime;//上传时间 - private String temperature;//温度 - private String o2;//氧气 - private String sh;//硫化氢 - private String ch4;//甲烷 - private String co;//一氧化碳 - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getDeviceName() { - return deviceName; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public String getUpTime() { - return upTime; - } - - public void setUpTime(String upTime) { - this.upTime = upTime; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getO2() { - return o2; - } - - public void setO2(String o2) { - this.o2 = o2; - } - - public String getSh() { - return sh; - } - - public void setSh(String sh) { - this.sh = sh; - } - - public String getCh4() { - return ch4; - } - - public void setCh4(String ch4) { - this.ch4 = ch4; - } - - public String getCo() { - return co; - } - - public void setCo(String co) { - this.co = co; - } - - public PgSenseDevDto(PgSenseDev pgSenseDev) - { - SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - this.setId(String.valueOf(pgSenseDev.getId())); - this.setDeviceName(pgSenseDev.getPgDeviceId().getDevName()); - this.setUpTime(sdf.format(pgSenseDev.getUpTime())); - this.setTemperature(pgSenseDev.getTemperature()); - this.setCh4(pgSenseDev.getCh4()); - this.setCo(pgSenseDev.getCo()); - this.setO2(pgSenseDev.getO2()); - this.setSh(pgSenseDev.getSh()); - } - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java index 17255f8..a226aa0 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,14 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCh4Manager extends HibernateEntityDao { + //获取设备时间段内所有的监测数据 + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCh4List=criteria.list(); + + for (PgCh4 pgCh4 : pgCh4List) { + pgCh4DtoList.add(new PgCh4Dto(pgCh4)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCh4DtoList; + } } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java index d5a160a..f396ae6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,12 +1,60 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgCoManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgCoList=criteria.list(); + + for (PgCo pgCo : pgCoList) { + pgCoDtoList.add(new PgCoDto(pgCo)); + } + } + catch(Exception ex) + { + return null; + } + + return pgCoDtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java index 62e762f..bd2256c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgO2Manager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgO2List=criteria.list(); + + for (PgO2 pgO2 : pgO2List) { + pgO2DtoList.add(new PgO2Dto(pgO2)); + } + } + catch(Exception ex) + { + return null; + } + + return pgO2DtoList; + } + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java deleted file mode 100644 index c43129e..0000000 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgSenseDevManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.casic.PgInterface.devData.manager; - -import org.springframework.stereotype.Service; - -/** - * Created by yxw on 2017/11/2. - */ -@Service -public class PgSenseDevManager { - -} diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java index dd910df..0a2885c 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,12 +1,58 @@ package com.casic.PgInterface.devData.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + /** * Created by yxw on 2017/11/28. */ @Service public class PgShManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgSh.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgShList=criteria.list(); + for (PgSh pgSh : pgShList) { + pgShDtoList.add(new PgShDto(pgSh)); + } + } + catch(Exception ex) + { + return null; + } + + return pgShDtoList; + } + + } diff --git a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java index 99d902a..a6e7473 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,8 +5,55 @@ */ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; +import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devTable.domain.PgDevice; +import org.hibernate.Criteria; +import org.hibernate.criterion.Order; +import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + @Service public class PgTempHumManager extends HibernateEntityDao { + + //获取设备时间段内所有的监测数据 + public List getAllTempHumData(PgDevice pgDevice,String startDate,String endDate) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + + if (StringUtils.isNotBlank(startDate)) { + criteria.add(Restrictions.ge("upTime", DateUtils.sdf4.parse(startDate))); + } + if(StringUtils.isNotBlank(endDate)){ + Calendar calendar=Calendar.getInstance(); + calendar.setTime(DateUtils.sdf4.parse(endDate)); + calendar.add(Calendar.DATE,1); + criteria.add(Restrictions.le("upTime",calendar.getTime())); + } + + List pgTempHumList=criteria.list(); + + for (PgTempHum pgTempHum : pgTempHumList) { + pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); + } + } + catch(Exception ex) + { + return null; + } + + return pgTempHumDtoList; + } + } 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 9951bcd..cfa0281 100644 --- a/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java +++ b/src/main/java/com/casic/PgInterface/devTable/domain/PgDevice.java @@ -29,7 +29,6 @@ private PgDeviceType devTypeId;//设备类型 private List pgAlarms; private PgPartition pgPartitionId;//所在管廊信息 - private List pgSenseDevs;// private List pgTempHums;//温湿度 private List pgCos;//一氧化碳 private List pgO2s;//氧气 @@ -141,15 +140,6 @@ } @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") - public List getPgSenseDevs() { - return pgSenseDevs; - } - - public void setPgSenseDevs(List pgSenseDevs) { - this.pgSenseDevs = pgSenseDevs; - } - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "pgDeviceId") public List getPgTempHums() { return pgTempHums; } 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 0c2d208..491902b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java +++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgAlarmTjManager.java @@ -26,23 +26,26 @@ } // - public List getAlarmTjResultByType() throws Exception { + public List getAlarmTjResultByType(String startDate,String endDate) throws Exception { - List pgAlarmTjDtoList=new ArrayList(); - PgAlarmTjDto pgAlarmTjDto=new PgAlarmTjDto(); + List pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); - String hql=""; + String sql = ""; - for(int i=0;i getAlarmTjByAlarmType() throws Exception - { - List pgAlarmTypeDtoList = pgAlarmTypeManager.getAllAlarmType(); - Session session=this.getSession(); - String sql=""; + public List getAlarmTjResultByDate() throws Exception { - for(int i=0;i pgAlarmTjDtoList = new ArrayList(); + PgAlarmTjDto pgAlarmTjDto = null; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List pgAlarmTypeList = pgAlarmTypeManager.getAllAlarmType(); + String sql = ""; + + for (int i = 0; i < pgAlarmTypeList.size(); i++) { + + pgAlarmTjDto = new PgAlarmTjDto(); + sql = "select count(*) from PG_ALARM pgAlarm where pgAlarm.alarmTypeId = " + pgAlarmTypeList.get(i).getId(); + + Query query = this.getSession().createSQLQuery(sql); + int numCount = Integer.valueOf(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmNum(String.valueOf(query.uniqueResult())); + pgAlarmTjDto.setAlarmType(pgAlarmTypeList.get(i).getAlarmType()); + pgAlarmTjDtoList.add(pgAlarmTjDto); } + + return pgAlarmTjDtoList; } - */ + + + } diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java index 831b021..6110baf 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmTjRs.java @@ -12,7 +12,6 @@ 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; @@ -37,14 +36,15 @@ * 按类型统计历史报警记录 */ @POST - @Path("getAlarmTypeTjResult") + @Path("getTjResultByAlarmType") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTypeTjResult()throws Exception{ + public Map getTjResultByAlarmType(@FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); String msg = ""; List pgAlarmTjDtoList=null; try{ - pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(); + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByType(startDate,endDate); msg="获取成功"; } catch(Exception ex) { @@ -59,25 +59,21 @@ * 历史报警统计 */ @POST - @Path("getAlarmTypeCountAmongDate") + @Path("getTjResultByDate") @Produces(MediaType.APPLICATION_JSON) - public Map getAlarmTJByDate(@FormParam("startDate") String startDate, + public Map getTjResultByDate(@FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception{ Map resultMap = new HashMap(); - String result = ""; String msg = ""; + List pgAlarmTjDtoList=null; try{ - List pgAlarmTjDtoList=new ArrayList(); - - - + pgAlarmTjDtoList=pgAlarmTjManager.getAlarmTjResultByDate(); + msg="获取成功"; } - catch(Exception ex) - { - result="false"; - msg="统计失败"; + catch(Exception ex) { + msg = "统计失败"; } - resultMap.put("result",result); + resultMap.put("result",pgAlarmTjDtoList); resultMap.put("msg",msg); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java new file mode 100644 index 0000000..3992a32 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCh4; +import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.manager.PgCh4Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCh4") +public class PgCh4Rs { + + private static Logger logger = LoggerFactory.getLogger(PgCh4Rs.class); + + private PgCh4Manager pgCh4Manager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCh4Manager(PgCh4Manager pgCh4Manager) { + this.pgCh4Manager = pgCh4Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCh4InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCh4DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgCh4DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCh4Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addCh4Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("ch4") String ch4)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCh4 pgCh4=new PgCh4(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCh4.setCh4(ch4); + pgCh4.setLogTime(new Date()); + pgCh4.setUpTime(sdf.parse(upTime)); + pgCh4.setPgDeviceId(pgDevice); + + pgCh4Manager.save(pgCh4); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java new file mode 100644 index 0000000..0bbfdc2 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -0,0 +1,118 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgCo; +import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.manager.PgCoManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgCo") +public class PgCoRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgCoManager pgCoManager; + + private PgDeviceManager pgDeviceManager; + + @Resource + public void setPgCoManager(PgCoManager pgCoManager) { + this.pgCoManager = pgCoManager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getCoInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgCoDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgCoDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addCoData") + @Produces(MediaType.APPLICATION_JSON) + public Map addCoData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("co") String co)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgCo pgCo=new PgCo(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgCo.setCo(co); + pgCo.setLogTime(new Date()); + pgCo.setUpTime(sdf.parse(upTime)); + pgCo.setPgDeviceId(pgDevice); + + pgCoManager.save(pgCo); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java index 66d0822..ea3ec08 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgLogRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgLogRs.java @@ -8,17 +8,14 @@ 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.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by yxw on 2017/11/4. @@ -50,11 +47,10 @@ @Path("addLog") @Produces(MediaType.APPLICATION_JSON) public Map addLog(@FormParam("userName") String userName, - @FormParam("operate") String operate, - @FormParam("operateTime") String operateTime) + @FormParam("operate") String operate) throws Exception { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Map resultMap = new HashMap(); String result = ""; @@ -66,7 +62,7 @@ pgLog.setPatrolerId(pgPatroler); pgLog.setOperate(operate); - pgLog.setOperateTime(sdf.parse(operateTime)); + pgLog.setOperateTime(new Date()); pgLog.setActive(1); pgLogManager.save(pgLog); diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java new file mode 100644 index 0000000..691cf44 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgO2Dto; +import com.casic.PgInterface.devData.manager.PgO2Manager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgO2") +public class PgO2Rs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgO2Manager pgO2Manager; + + @Resource + public void setPgO2Manager(PgO2Manager pgO2Manager) { + this.pgO2Manager = pgO2Manager; + } + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getO2InfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getO2InfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgO2DtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgO2DtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2DtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addO2Data") + @Produces(MediaType.APPLICATION_JSON) + public Map addO2Data(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("o2") String o2)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgO2 pgO2=new PgO2(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgO2.setO2(o2); + pgO2.setLogTime(new Date()); + pgO2.setUpTime(sdf.parse(upTime)); + pgO2.setPgDeviceId(pgDevice); + + pgO2Manager.save(pgO2); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java b/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java deleted file mode 100644 index 4ca31a3..0000000 --- a/src/main/java/com/casic/PgInterface/rs/PgSenseDevRs.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.PgInterface.rs; - -import com.casic.PgInterface.devData.manager.PgSenseDevManager; -import com.casic.PgInterface.devTable.manager.PgPartitionManager; -import com.casic.PgInterface.devTable.manager.PipeGalleryManager; -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.HashMap; -import java.util.Map; - -/** - * Created by yxw on 2017/11/3. - */ -@Component -@Path("pgSenseDev") -public class PgSenseDevRs { - private static Logger logger = LoggerFactory.getLogger(PgSenseDevRs.class); - - private PgSenseDevManager pgSenseDevManager; - - private PipeGalleryManager pipeGalleryManager; - - private PgPartitionManager pgPartitionManager; - - @Resource - public void setPgSenseDevManager(PgSenseDevManager pgSenseDevManager) { - this.pgSenseDevManager = pgSenseDevManager; - } - - @Resource - public void setPipeGalleryManager(PipeGalleryManager pipeGalleryManager) { - this.pipeGalleryManager = pipeGalleryManager; - } - - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - /** - * 查询监测数据 - */ - @POST - @Path("getSenseDataByRegion") - @Produces(MediaType.APPLICATION_JSON) - public Map getSenseData(@FormParam("pgName") String pgName, - @FormParam("parName") String parName) - throws Exception { - Map resultMap = new HashMap(); - - - - - - return resultMap; - } - - - -} diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java new file mode 100644 index 0000000..673612b --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -0,0 +1,120 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgShDto; +import com.casic.PgInterface.devData.manager.PgShManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgSh") +public class PgShRs { + + private static Logger logger = LoggerFactory.getLogger(PgO2Rs.class); + + private PgDeviceManager pgDeviceManager; + + private PgShManager pgShManager; + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgShManager(PgShManager pgShManager) { + this.pgShManager = pgShManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getShInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getShInfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgShDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgShDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate); + if(pgShDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgShDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addShData") + @Produces(MediaType.APPLICATION_JSON) + public Map addShData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("sh") String sh)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgSh pgSh=new PgSh(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgSh.setSh(sh); + pgSh.setLogTime(new Date()); + pgSh.setUpTime(sdf.parse(upTime)); + pgSh.setPgDeviceId(pgDevice); + + pgShManager.save(pgSh); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", result); + resultMap.put("msg", msg); + return resultMap; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java new file mode 100644 index 0000000..a5ae51e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -0,0 +1,121 @@ +package com.casic.PgInterface.rs; + +import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgTempHumDto; +import com.casic.PgInterface.devData.manager.PgTempHumManager; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; +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.text.SimpleDateFormat; +import java.util.*; + +/** + * Created by yxw on 2017/12/10. + */ +@Component +@Path("pgTempHum") +public class PgTempHumRs { + + private static Logger logger = LoggerFactory.getLogger(PgCoRs.class); + + private PgDeviceManager pgDeviceManager; + + private PgTempHumManager pgTempHumManager; + + @Resource + public void setPgDeviceManager(PgDeviceManager pgDeviceManager) { + this.pgDeviceManager = pgDeviceManager; + } + + @Resource + public void setPgTempHumManager(PgTempHumManager pgTempHumManager) { + this.pgTempHumManager = pgTempHumManager; + } + + /** + * 获取设备监测数据 + */ + @POST + @Path("getTempHumInfoByDevAndDate") + @Produces(MediaType.APPLICATION_JSON) + public Map getTempHumInfoByDevAndDate(@FormParam("devName") String devName, + @FormParam("startDate") String startDate, + @FormParam("endDate") String endDate)throws Exception { + Map resultMap = new HashMap(); + String msg=""; + List pgTempHumDtoList=new ArrayList(); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgTempHumDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate); + if(pgTempHumDtoList==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgTempHumDtoList); + return resultMap; + } + + /** + * 新增数据 + */ + @POST + @Path("addTempHumData") + @Produces(MediaType.APPLICATION_JSON) + public Map addTempHumData(@FormParam("devCode") String devCode, + @FormParam("upTime") String upTime, + @FormParam("temp") String temp, + @FormParam("hum") String hum)throws Exception { + Map resultMap = new HashMap(); + String result = ""; + String msg = ""; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + try { + PgTempHum pgTempHum=new PgTempHum(); + PgDevice pgDevice=pgDeviceManager.getDeviceBydevCode(devCode); + if (pgDevice== null) { + result = "false"; + msg = "不存在编号为"+devCode+"的设备"; + } else { + pgTempHum.setTemp(temp); + pgTempHum.setHum(hum); + pgTempHum.setLogTime(new Date()); + pgTempHum.setUpTime(sdf.parse(upTime)); + pgTempHum.setPgDeviceId(pgDevice); + + pgTempHumManager.save(pgTempHum); + result = "true"; + msg = "保存成功"; + } + } catch (Exception e) { + result = "false"; + msg = "保存失败"; + e.printStackTrace(); + } + + resultMap.put("result", 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" index 815a40c..681b604 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 diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" index 92e8fa2..371f1a3 100644 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" +++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" Binary files differ