diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCoDtoList; } //获取设备最新数据 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } 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 666c14c..0eab502 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,37 +17,31 @@ public class PgO2Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgO2DtoList=new ArrayList(); + public List getAllO2Data(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgO2.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),o2 from PG_O2 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgO2List=criteria.list(); - for (PgO2 pgO2 : pgO2List) { - pgO2DtoList.add(new PgO2Dto(pgO2)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgO2DtoList; } //获取设备最新数据 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } 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 666c14c..0eab502 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,37 +17,31 @@ public class PgO2Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgO2DtoList=new ArrayList(); + public List getAllO2Data(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgO2.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),o2 from PG_O2 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgO2List=criteria.list(); - for (PgO2 pgO2 : pgO2List) { - pgO2DtoList.add(new PgO2Dto(pgO2)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgO2DtoList; } //获取设备最新数据 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 7cb6286..5cab7b6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,36 +17,31 @@ public class PgShManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { - - List pgShDtoList=new ArrayList(); + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgSh.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),sh from PG_SH where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgShList=criteria.list(); - for (PgSh pgSh : pgShList) { - pgShDtoList.add(new PgShDto(pgSh)); - } + + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgShDtoList; } //获取设备最新数据 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } 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 666c14c..0eab502 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,37 +17,31 @@ public class PgO2Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgO2DtoList=new ArrayList(); + public List getAllO2Data(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgO2.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),o2 from PG_O2 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgO2List=criteria.list(); - for (PgO2 pgO2 : pgO2List) { - pgO2DtoList.add(new PgO2Dto(pgO2)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgO2DtoList; } //获取设备最新数据 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 7cb6286..5cab7b6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,36 +17,31 @@ public class PgShManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { - - List pgShDtoList=new ArrayList(); + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgSh.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),sh from PG_SH where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgShList=criteria.list(); - for (PgSh pgSh : pgShList) { - pgShDtoList.add(new PgShDto(pgSh)); - } + + return pgHistoryDataDtoList; } 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 61df349..314f417 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,55 +5,45 @@ */ 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.PgHistoryTempDto; 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(); + public List getAllTempHumData(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgTempHum.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),temp,hum from PG_TEMPHUM where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryTempDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryTempDto pgHistoryTempDto=new PgHistoryTempDto(); + pgHistoryTempDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryTempDto.setTemp(String.valueOf(objects1[1])); + pgHistoryTempDto.setHum(String.valueOf(objects1[2])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryTempDtoList.add(pgHistoryTempDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgTempHumList=criteria.list(); - for (PgTempHum pgTempHum : pgTempHumList) { - pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); - } + return pgHistoryTempDtoList; } catch(Exception ex) { return null; } - - return pgTempHumDtoList; } //获取设备最新数据 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } 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 666c14c..0eab502 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,37 +17,31 @@ public class PgO2Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgO2DtoList=new ArrayList(); + public List getAllO2Data(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgO2.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),o2 from PG_O2 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgO2List=criteria.list(); - for (PgO2 pgO2 : pgO2List) { - pgO2DtoList.add(new PgO2Dto(pgO2)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgO2DtoList; } //获取设备最新数据 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 7cb6286..5cab7b6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,36 +17,31 @@ public class PgShManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { - - List pgShDtoList=new ArrayList(); + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgSh.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),sh from PG_SH where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgShList=criteria.list(); - for (PgSh pgSh : pgShList) { - pgShDtoList.add(new PgShDto(pgSh)); - } + + return pgHistoryDataDtoList; } 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 61df349..314f417 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,55 +5,45 @@ */ 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.PgHistoryTempDto; 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(); + public List getAllTempHumData(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgTempHum.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),temp,hum from PG_TEMPHUM where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryTempDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryTempDto pgHistoryTempDto=new PgHistoryTempDto(); + pgHistoryTempDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryTempDto.setTemp(String.valueOf(objects1[1])); + pgHistoryTempDto.setHum(String.valueOf(objects1[2])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryTempDtoList.add(pgHistoryTempDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgTempHumList=criteria.list(); - for (PgTempHum pgTempHum : pgTempHumList) { - pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); - } + return pgHistoryTempDtoList; } catch(Exception ex) { return null; } - - return pgTempHumDtoList; } //获取设备最新数据 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 98d84b1..a9ef521 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCh4Manager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -44,15 +45,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCh4DtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); - if(pgCh4DtoList==null) + pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -62,7 +63,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCh4DtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } 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 666c14c..0eab502 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,37 +17,31 @@ public class PgO2Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgO2DtoList=new ArrayList(); + public List getAllO2Data(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgO2.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),o2 from PG_O2 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgO2List=criteria.list(); - for (PgO2 pgO2 : pgO2List) { - pgO2DtoList.add(new PgO2Dto(pgO2)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgO2DtoList; } //获取设备最新数据 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 7cb6286..5cab7b6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,36 +17,31 @@ public class PgShManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { - - List pgShDtoList=new ArrayList(); + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgSh.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),sh from PG_SH where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgShList=criteria.list(); - for (PgSh pgSh : pgShList) { - pgShDtoList.add(new PgShDto(pgSh)); - } + + return pgHistoryDataDtoList; } 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 61df349..314f417 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,55 +5,45 @@ */ 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.PgHistoryTempDto; 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(); + public List getAllTempHumData(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgTempHum.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),temp,hum from PG_TEMPHUM where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryTempDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryTempDto pgHistoryTempDto=new PgHistoryTempDto(); + pgHistoryTempDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryTempDto.setTemp(String.valueOf(objects1[1])); + pgHistoryTempDto.setHum(String.valueOf(objects1[2])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryTempDtoList.add(pgHistoryTempDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgTempHumList=criteria.list(); - for (PgTempHum pgTempHum : pgTempHumList) { - pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); - } + return pgHistoryTempDtoList; } catch(Exception ex) { return null; } - - return pgTempHumDtoList; } //获取设备最新数据 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 98d84b1..a9ef521 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCh4Manager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -44,15 +45,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCh4DtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); - if(pgCh4DtoList==null) + pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -62,7 +63,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCh4DtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index c72603e..a7eac39 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCoManager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -42,15 +43,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCoDtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); - if(pgCoDtoList==null) + pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -60,7 +61,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCoDtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } 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 666c14c..0eab502 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,37 +17,31 @@ public class PgO2Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgO2DtoList=new ArrayList(); + public List getAllO2Data(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgO2.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),o2 from PG_O2 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgO2List=criteria.list(); - for (PgO2 pgO2 : pgO2List) { - pgO2DtoList.add(new PgO2Dto(pgO2)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgO2DtoList; } //获取设备最新数据 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 7cb6286..5cab7b6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,36 +17,31 @@ public class PgShManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { - - List pgShDtoList=new ArrayList(); + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgSh.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),sh from PG_SH where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgShList=criteria.list(); - for (PgSh pgSh : pgShList) { - pgShDtoList.add(new PgShDto(pgSh)); - } + + return pgHistoryDataDtoList; } 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 61df349..314f417 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,55 +5,45 @@ */ 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.PgHistoryTempDto; 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(); + public List getAllTempHumData(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgTempHum.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),temp,hum from PG_TEMPHUM where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryTempDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryTempDto pgHistoryTempDto=new PgHistoryTempDto(); + pgHistoryTempDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryTempDto.setTemp(String.valueOf(objects1[1])); + pgHistoryTempDto.setHum(String.valueOf(objects1[2])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryTempDtoList.add(pgHistoryTempDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgTempHumList=criteria.list(); - for (PgTempHum pgTempHum : pgTempHumList) { - pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); - } + return pgHistoryTempDtoList; } catch(Exception ex) { return null; } - - return pgTempHumDtoList; } //获取设备最新数据 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 98d84b1..a9ef521 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCh4Manager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -44,15 +45,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCh4DtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); - if(pgCh4DtoList==null) + pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -62,7 +63,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCh4DtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index c72603e..a7eac39 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCoManager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -42,15 +43,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCoDtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); - if(pgCoDtoList==null) + pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -60,7 +61,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCoDtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 8dfea1b..3a67bf3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.dto.PgO2Dto; import com.casic.PgInterface.devData.manager.PgO2Manager; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -42,15 +43,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgO2DtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); - if(pgO2DtoList==null) + pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -60,7 +61,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgO2DtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } 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 666c14c..0eab502 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,37 +17,31 @@ public class PgO2Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgO2DtoList=new ArrayList(); + public List getAllO2Data(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgO2.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),o2 from PG_O2 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgO2List=criteria.list(); - for (PgO2 pgO2 : pgO2List) { - pgO2DtoList.add(new PgO2Dto(pgO2)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgO2DtoList; } //获取设备最新数据 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 7cb6286..5cab7b6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,36 +17,31 @@ public class PgShManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { - - List pgShDtoList=new ArrayList(); + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgSh.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),sh from PG_SH where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgShList=criteria.list(); - for (PgSh pgSh : pgShList) { - pgShDtoList.add(new PgShDto(pgSh)); - } + + return pgHistoryDataDtoList; } 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 61df349..314f417 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,55 +5,45 @@ */ 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.PgHistoryTempDto; 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(); + public List getAllTempHumData(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgTempHum.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),temp,hum from PG_TEMPHUM where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryTempDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryTempDto pgHistoryTempDto=new PgHistoryTempDto(); + pgHistoryTempDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryTempDto.setTemp(String.valueOf(objects1[1])); + pgHistoryTempDto.setHum(String.valueOf(objects1[2])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryTempDtoList.add(pgHistoryTempDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgTempHumList=criteria.list(); - for (PgTempHum pgTempHum : pgTempHumList) { - pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); - } + return pgHistoryTempDtoList; } catch(Exception ex) { return null; } - - return pgTempHumDtoList; } //获取设备最新数据 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 98d84b1..a9ef521 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCh4Manager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -44,15 +45,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCh4DtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); - if(pgCh4DtoList==null) + pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -62,7 +63,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCh4DtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index c72603e..a7eac39 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCoManager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -42,15 +43,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCoDtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); - if(pgCoDtoList==null) + pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -60,7 +61,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCoDtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 8dfea1b..3a67bf3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.dto.PgO2Dto; import com.casic.PgInterface.devData.manager.PgO2Manager; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -42,15 +43,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgO2DtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); - if(pgO2DtoList==null) + pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -60,7 +61,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgO2DtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java index a9e968b..1e35f4b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devData.manager.PgShManager; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -44,15 +45,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgShDtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgShDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate); - if(pgShDtoList==null) + pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -62,7 +63,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgShDtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 68c3ad8..c86c514 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,14 +6,20 @@ - + + + - + + + + + @@ -79,7 +85,7 @@ - + @@ -91,8 +97,8 @@ - - + + @@ -103,8 +109,8 @@ - - + + @@ -112,7 +118,7 @@ - + @@ -129,10 +135,10 @@ - + - - + + @@ -197,13 +203,6 @@ @@ -1300,7 +1287,7 @@ - @@ -1312,10 +1299,10 @@ - + - + @@ -1327,7 +1314,7 @@ - + @@ -1351,7 +1338,7 @@ - + @@ -1412,7 +1399,6 @@ - @@ -1437,7 +1423,8 @@ - @@ -1473,72 +1460,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1553,13 +1474,6 @@ - - - - - - - @@ -1644,13 +1558,6 @@ - - - - - - - @@ -1752,27 +1659,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1780,30 +1666,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1811,10 +1673,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java new file mode 100644 index 0000000..09e4374 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryDataDto.java @@ -0,0 +1,25 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryDataDto { + + private String upTime; + private String value; + + public String getUpTime() { + return upTime; + } + + public void setUpTime(String upTime) { + this.upTime = upTime; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java new file mode 100644 index 0000000..f85dbcb --- /dev/null +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgHistoryTempDto.java @@ -0,0 +1,22 @@ +package com.casic.PgInterface.devData.dto; + +public class PgHistoryTempDto extends PgHistoryDataDto { + private String temp; + private String hum; + + public String getTemp() { + return temp; + } + + public void setTemp(String temp) { + this.temp = temp; + } + + public String getHum() { + return hum; + } + + public void setHum(String hum) { + this.hum = hum; + } +} 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 6f8d3ff..8404d85 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -1,18 +1,13 @@ 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.devData.dto.PgHistoryDataDto; 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; /** @@ -22,38 +17,31 @@ public class PgCh4Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgCh4DtoList=new ArrayList(); + public List getAllCH4Data(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCh4.class); - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),ch4 from PG_CH4 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); - } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); + + pgHistoryDataDtoList.add(pgHistoryDataDto); } - criteria.addOrder(Order.desc("upTime")); - - List pgCh4List=criteria.list(); - - for (PgCh4 pgCh4 : pgCh4List) { - pgCh4DtoList.add(new PgCh4Dto(pgCh4)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgCh4DtoList; } //获取设备最新数据 @@ -84,5 +72,4 @@ } - } \ No newline at end of file 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 525722c..aa5662a 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -1,18 +1,13 @@ 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.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; 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; /** @@ -22,37 +17,30 @@ public class PgCoManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { - - List pgCoDtoList=new ArrayList(); - + public List getAllCoData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgCo.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),co from PG_CO where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgCoList=criteria.list(); - for (PgCo pgCo : pgCoList) { - pgCoDtoList.add(new PgCoDto(pgCo)); - } + return pgHistoryDataDtoList; } 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 666c14c..0eab502 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,37 +17,31 @@ public class PgO2Manager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllO2Data(PgDevice pgDevice,String startDate,String endDate) { - - List pgO2DtoList=new ArrayList(); + public List getAllO2Data(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgO2.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),o2 from PG_O2 where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgO2List=criteria.list(); - for (PgO2 pgO2 : pgO2List) { - pgO2DtoList.add(new PgO2Dto(pgO2)); - } + return pgHistoryDataDtoList; } catch(Exception ex) { return null; } - - return pgO2DtoList; } //获取设备最新数据 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 7cb6286..5cab7b6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -1,18 +1,13 @@ 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.PgHistoryDataDto; 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; /** @@ -22,36 +17,31 @@ public class PgShManager extends HibernateEntityDao { //获取设备时间段内所有的监测数据 - public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { - - List pgShDtoList=new ArrayList(); + public List getAllShData(PgDevice pgDevice,String startDate,String endDate) { try { - Criteria criteria = createCriteria(PgSh.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),sh from PG_SH where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryDataDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryDataDto pgHistoryDataDto=new PgHistoryDataDto(); + pgHistoryDataDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryDataDto.setValue(String.valueOf(objects1[1])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryDataDtoList.add(pgHistoryDataDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgShList=criteria.list(); - for (PgSh pgSh : pgShList) { - pgShDtoList.add(new PgShDto(pgSh)); - } + + return pgHistoryDataDtoList; } 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 61df349..314f417 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -5,55 +5,45 @@ */ 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.PgHistoryTempDto; 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(); + public List getAllTempHumData(PgDevice pgDevice, String startDate, String endDate) { try { - Criteria criteria = createCriteria(PgTempHum.class); + String sql="select distinct to_char(upTime,'yyyy-MM-dd'),temp,hum from PG_TEMPHUM where PGDEVICEID="+pgDevice.getId(); + if(startDate!=null) + sql+=" and upTime > to_date('"+startDate+"','yyyy-MM-dd')"; + if(endDate!=null) + sql+=" and upTime < to_date('"+endDate+"','yyyy-MM-dd')"; - criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + List pgHistoryTempDtoList=new ArrayList<>(); + List objects=this.getSession().createSQLQuery(sql).list(); + for(Object[] objects1:objects){ + PgHistoryTempDto pgHistoryTempDto=new PgHistoryTempDto(); + pgHistoryTempDto.setUpTime(String.valueOf(objects1[0])); + pgHistoryTempDto.setTemp(String.valueOf(objects1[1])); + pgHistoryTempDto.setHum(String.valueOf(objects1[2])); - if (StringUtils.isNotBlank(startDate)) { - criteria.add(Restrictions.ge("upTime", DateUtils.sdf_day.parse(startDate))); + pgHistoryTempDtoList.add(pgHistoryTempDto); } - if(StringUtils.isNotBlank(endDate)){ - Calendar calendar=Calendar.getInstance(); - calendar.setTime(DateUtils.sdf_day.parse(endDate)); - calendar.add(Calendar.DATE,1); - criteria.add(Restrictions.le("upTime",calendar.getTime())); - } - criteria.addOrder(Order.desc("upTime")); - List pgTempHumList=criteria.list(); - for (PgTempHum pgTempHum : pgTempHumList) { - pgTempHumDtoList.add(new PgTempHumDto(pgTempHum)); - } + return pgHistoryTempDtoList; } catch(Exception ex) { return null; } - - return pgTempHumDtoList; } //获取设备最新数据 diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 98d84b1..a9ef521 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.dto.PgCh4Dto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCh4Manager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -44,15 +45,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCh4DtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCh4DtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); - if(pgCh4DtoList==null) + pgHistoryDataDtoList=pgCh4Manager.getAllCH4Data(pgDevice,startDate,endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -62,7 +63,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCh4DtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index c72603e..a7eac39 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devData.domain.PgCo; import com.casic.PgInterface.devData.dto.PgCoDto; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.manager.PgCoManager; import com.casic.PgInterface.devTable.domain.PgDevice; import com.casic.PgInterface.devTable.manager.PgDeviceManager; @@ -42,15 +43,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgCoDtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgCoDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); - if(pgCoDtoList==null) + pgHistoryDataDtoList=pgCoManager.getAllCoData(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -60,7 +61,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgCoDtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 8dfea1b..3a67bf3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.devData.domain.PgO2; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.dto.PgO2Dto; import com.casic.PgInterface.devData.manager.PgO2Manager; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -42,15 +43,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgO2DtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgO2DtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); - if(pgO2DtoList==null) + pgHistoryDataDtoList=pgO2Manager.getAllO2Data(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -60,7 +61,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgO2DtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java index a9e968b..1e35f4b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.devData.domain.PgSh; +import com.casic.PgInterface.devData.dto.PgHistoryDataDto; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devData.manager.PgShManager; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -44,15 +45,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgShDtoList=new ArrayList(); + List pgHistoryDataDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgShDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate); - if(pgShDtoList==null) + pgHistoryDataDtoList=pgShManager.getAllShData(pgDevice, startDate, endDate); + if(pgHistoryDataDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -62,7 +63,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgShDtoList); + resultMap.put("result",pgHistoryDataDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java index 2888d25..a23b2da 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.devData.domain.PgTempHum; +import com.casic.PgInterface.devData.dto.PgHistoryTempDto; import com.casic.PgInterface.devData.dto.PgTempHumDto; import com.casic.PgInterface.devData.manager.PgTempHumManager; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -42,15 +43,15 @@ @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); String msg=""; - List pgTempHumDtoList=new ArrayList(); + List pgHistoryTempDtoList=new ArrayList<>(); try { PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); if(pgDevice==null) msg="设备不存在"; else{ - pgTempHumDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate); - if(pgTempHumDtoList==null) + pgHistoryTempDtoList=pgTempHumManager.getAllTempHumData(pgDevice, startDate, endDate); + if(pgHistoryTempDtoList==null) msg="没有满足要求的数据"; else msg="数据获取成功"; @@ -60,7 +61,7 @@ msg="设备监测数据获取失败"; } resultMap.put("msg",msg); - resultMap.put("result",pgTempHumDtoList); + resultMap.put("result",pgHistoryTempDtoList); return resultMap; }