diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5a7aec8..8b8265b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -149,9 +149,8 @@ public PgDeviceDto(PgDevice pgDevice) { if (pgDevice == null) - { return; - } + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgDevice.getId())); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5a7aec8..8b8265b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -149,9 +149,8 @@ public PgDeviceDto(PgDevice pgDevice) { if (pgDevice == null) - { return; - } + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgDevice.getId())); diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 38c31e9..f7b3fac 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCh4InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCh4Dto pgCh4Dto=new PgCh4Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice); + if(pgCh4Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5a7aec8..8b8265b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -149,9 +149,8 @@ public PgDeviceDto(PgDevice pgDevice) { if (pgDevice == null) - { return; - } + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgDevice.getId())); diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 38c31e9..f7b3fac 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCh4InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCh4Dto pgCh4Dto=new PgCh4Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice); + if(pgCh4Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 7000bc2..5666da7 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -47,7 +47,7 @@ @POST @Path("getCoInfoByDevAndDate") @Produces(MediaType.APPLICATION_JSON) - public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode, + public Map getCoInfoByDevAndDate(@FormParam("assetCode") String assetCode, @FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); @@ -75,6 +75,39 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCoInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCoInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCoDto pgCoDto=new PgCoDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDto=pgCoManager.getNewestCoData(pgDevice); + if(pgCoDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDto); + return resultMap; + } + + + /** * 新增数据 */ @POST diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5a7aec8..8b8265b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -149,9 +149,8 @@ public PgDeviceDto(PgDevice pgDevice) { if (pgDevice == null) - { return; - } + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgDevice.getId())); diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 38c31e9..f7b3fac 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCh4InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCh4Dto pgCh4Dto=new PgCh4Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice); + if(pgCh4Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 7000bc2..5666da7 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -47,7 +47,7 @@ @POST @Path("getCoInfoByDevAndDate") @Produces(MediaType.APPLICATION_JSON) - public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode, + public Map getCoInfoByDevAndDate(@FormParam("assetCode") String assetCode, @FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); @@ -75,6 +75,39 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCoInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCoInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCoDto pgCoDto=new PgCoDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDto=pgCoManager.getNewestCoData(pgDevice); + if(pgCoDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDto); + return resultMap; + } + + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 0292e79..7d2e0e4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestO2InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestO2InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgO2Dto pgO2Dto=new PgO2Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice); + if(pgO2Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5a7aec8..8b8265b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -149,9 +149,8 @@ public PgDeviceDto(PgDevice pgDevice) { if (pgDevice == null) - { return; - } + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgDevice.getId())); diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 38c31e9..f7b3fac 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCh4InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCh4Dto pgCh4Dto=new PgCh4Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice); + if(pgCh4Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 7000bc2..5666da7 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -47,7 +47,7 @@ @POST @Path("getCoInfoByDevAndDate") @Produces(MediaType.APPLICATION_JSON) - public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode, + public Map getCoInfoByDevAndDate(@FormParam("assetCode") String assetCode, @FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); @@ -75,6 +75,39 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCoInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCoInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCoDto pgCoDto=new PgCoDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDto=pgCoManager.getNewestCoData(pgDevice); + if(pgCoDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDto); + return resultMap; + } + + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 0292e79..7d2e0e4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestO2InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestO2InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgO2Dto pgO2Dto=new PgO2Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice); + if(pgO2Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java index 8c6c822..d3abb13 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestShInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestShInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgShDto pgShDto=new PgShDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgShDto=pgShManager.getNewestShData(pgDevice); + if(pgShDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgShDto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5a7aec8..8b8265b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -149,9 +149,8 @@ public PgDeviceDto(PgDevice pgDevice) { if (pgDevice == null) - { return; - } + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgDevice.getId())); diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 38c31e9..f7b3fac 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCh4InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCh4Dto pgCh4Dto=new PgCh4Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice); + if(pgCh4Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 7000bc2..5666da7 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -47,7 +47,7 @@ @POST @Path("getCoInfoByDevAndDate") @Produces(MediaType.APPLICATION_JSON) - public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode, + public Map getCoInfoByDevAndDate(@FormParam("assetCode") String assetCode, @FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); @@ -75,6 +75,39 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCoInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCoInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCoDto pgCoDto=new PgCoDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDto=pgCoManager.getNewestCoData(pgDevice); + if(pgCoDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDto); + return resultMap; + } + + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 0292e79..7d2e0e4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestO2InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestO2InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgO2Dto pgO2Dto=new PgO2Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice); + if(pgO2Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java index 8c6c822..d3abb13 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestShInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestShInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgShDto pgShDto=new PgShDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgShDto=pgShManager.getNewestShData(pgDevice); + if(pgShDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgShDto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java index b10200a..0f9d6c5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestTempHumInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestTempHumInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgTempHumDto pgTempHumDto=new PgTempHumDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice); + if(pgTempHumDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgTempHumDto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5a7aec8..8b8265b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -149,9 +149,8 @@ public PgDeviceDto(PgDevice pgDevice) { if (pgDevice == null) - { return; - } + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgDevice.getId())); diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 38c31e9..f7b3fac 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCh4InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCh4Dto pgCh4Dto=new PgCh4Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice); + if(pgCh4Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 7000bc2..5666da7 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -47,7 +47,7 @@ @POST @Path("getCoInfoByDevAndDate") @Produces(MediaType.APPLICATION_JSON) - public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode, + public Map getCoInfoByDevAndDate(@FormParam("assetCode") String assetCode, @FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); @@ -75,6 +75,39 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCoInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCoInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCoDto pgCoDto=new PgCoDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDto=pgCoManager.getNewestCoData(pgDevice); + if(pgCoDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDto); + return resultMap; + } + + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 0292e79..7d2e0e4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestO2InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestO2InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgO2Dto pgO2Dto=new PgO2Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice); + if(pgO2Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java index 8c6c822..d3abb13 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestShInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestShInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgShDto pgShDto=new PgShDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgShDto=pgShManager.getNewestShData(pgDevice); + if(pgShDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgShDto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java index b10200a..0f9d6c5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestTempHumInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestTempHumInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgTempHumDto pgTempHumDto=new PgTempHumDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice); + if(pgTempHumDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgTempHumDto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" new file mode 100644 index 0000000..297f4aa --- /dev/null +++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 95d7134..4270196 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,24 @@ - - + + + - - - - - - - + + + - - - - + + + + - + + @@ -47,20 +45,79 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -79,12 +136,6 @@ @@ -509,6 +566,74 @@ - @@ -1302,7 +1431,7 @@ - + @@ -1315,7 +1444,7 @@ - + @@ -1343,7 +1472,6 @@ - @@ -1368,7 +1496,8 @@ - @@ -1380,90 +1509,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1540,32 +1585,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1574,30 +1593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,14 +1633,6 @@ - - - - - - - - @@ -1806,18 +1793,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java index 7608e8a..9894929 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -66,6 +66,9 @@ } public PgCh4Dto(PgCh4 pgCh4) { + if(pgCh4==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCh4.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java index 530c1b9..d48a51a 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -66,6 +66,9 @@ } public PgCoDto(PgCo pgCo) { + + if(pgCo==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgCo.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java index f2f2847..c3a260d 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -66,6 +66,9 @@ } public PgO2Dto (PgO2 pgO2) { + if(pgO2==null) + return; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgO2.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java index 0f7d40b..850d2cc 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -66,6 +66,9 @@ } public PgShDto(PgSh pgSh) { + + if(pgSh==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgSh.getId())); diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java index d948129..7cfb661 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -75,6 +75,9 @@ } public PgTempHumDto(PgTempHum pgTempHum) { + + if(pgTempHum==null) + return; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); this.setId(String.valueOf(pgTempHum.getId())); 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 f74d1fb..1373125 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -57,4 +57,30 @@ return pgCh4DtoList; } + //获取设备最新数据 + public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { + + List pgCh4DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCh4List = criteria.list(); + if (pgCh4List.size() == 0) + return null; + else { + PgCh4 pgCh4 = pgCh4List.get(0); + return new PgCh4Dto(pgCh4); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 f396ae6..13f97bd 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -3,9 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; -import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgCo; -import com.casic.PgInterface.devData.dto.PgCh4Dto; import com.casic.PgInterface.devData.dto.PgCoDto; import com.casic.PgInterface.devTable.domain.PgDevice; import org.hibernate.Criteria; @@ -57,4 +55,30 @@ return pgCoDtoList; } + //获取设备最新数据 + public PgCoDto getNewestCoData(PgDevice pgDevice) { + + List pgCoDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCo.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgCoList = criteria.list(); + if (pgCoList.size() == 0) + return null; + else { + PgCo pgCo = pgCoList.get(0); + return new PgCoDto(pgCo); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 bd2256c..be64bad 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -55,4 +55,30 @@ return pgO2DtoList; } + //获取设备最新数据 + public PgO2Dto getNewestO2Data(PgDevice pgDevice) { + + List pgO2DtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgO2.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgO2List = criteria.list(); + if (pgO2List.size() == 0) + return null; + else { + PgO2 pgO2 = pgO2List.get(0); + return new PgO2Dto(pgO2); + } + } + catch(Exception ex) + { + return null; + } + } + + } 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 0a2885c..a92768f 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; +import com.casic.PgInterface.devData.domain.PgCh4; import com.casic.PgInterface.devData.domain.PgSh; import com.casic.PgInterface.devData.dto.PgShDto; import com.casic.PgInterface.devTable.domain.PgDevice; @@ -54,5 +55,30 @@ return pgShDtoList; } + //获取设备最新数据 + public PgShDto getNewestShData(PgDevice pgDevice) { + + List pgShDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgCh4.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgShList = criteria.list(); + if (pgShList.size() == 0) + return null; + else { + PgSh pgSh = pgShList.get(0); + return new PgShDto(pgSh); + } + } + catch(Exception ex) + { + return null; + } + } + } 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 a6e7473..7d08668 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -56,4 +56,29 @@ return pgTempHumDtoList; } + //获取设备最新数据 + public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { + + List pgTempHumDtoList=new ArrayList(); + + try { + Criteria criteria = createCriteria(PgTempHum.class); + criteria.addOrder(Order.desc("id")); + criteria.add(Restrictions.eq("pgDeviceId", pgDevice)); + criteria.addOrder(Order.desc("upTime")); + + List pgTempHumList = criteria.list(); + if (pgTempHumList.size() == 0) + return null; + else { + PgTempHum pgTempHum = pgTempHumList.get(0); + return new PgTempHumDto(pgTempHum); + } + } + catch(Exception ex) + { + return null; + } + } + } diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java index 5a7aec8..8b8265b 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -149,9 +149,8 @@ public PgDeviceDto(PgDevice pgDevice) { if (pgDevice == null) - { return; - } + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); this.setId(String.valueOf(pgDevice.getId())); diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java index 38c31e9..f7b3fac 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCh4InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCh4InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCh4Dto pgCh4Dto=new PgCh4Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCh4Dto=pgCh4Manager.getNewestCH4Data(pgDevice); + if(pgCh4Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCh4Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java index 7000bc2..5666da7 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java @@ -47,7 +47,7 @@ @POST @Path("getCoInfoByDevAndDate") @Produces(MediaType.APPLICATION_JSON) - public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode, + public Map getCoInfoByDevAndDate(@FormParam("assetCode") String assetCode, @FormParam("startDate") String startDate, @FormParam("endDate") String endDate)throws Exception { Map resultMap = new HashMap(); @@ -75,6 +75,39 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestCoInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestCoInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgCoDto pgCoDto=new PgCoDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgCoDto=pgCoManager.getNewestCoData(pgDevice); + if(pgCoDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgCoDto); + return resultMap; + } + + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java index 0292e79..7d2e0e4 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestO2InfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestO2InfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgO2Dto pgO2Dto=new PgO2Dto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgO2Dto=pgO2Manager.getNewestO2Data(pgDevice); + if(pgO2Dto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgO2Dto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java index 8c6c822..d3abb13 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestShInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestShInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgShDto pgShDto=new PgShDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgShDto=pgShManager.getNewestShData(pgDevice); + if(pgShDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgShDto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java index b10200a..0f9d6c5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java @@ -75,6 +75,38 @@ } /** + * 获取设备监测数据 + */ + @POST + @Path("getNewestTempHumInfoByDev") + @Produces(MediaType.APPLICATION_JSON) + public Map getNewestTempHumInfoByDev(@FormParam("assetCode") String assetCode)throws Exception { + + Map resultMap = new HashMap(); + String msg=""; + PgTempHumDto pgTempHumDto=new PgTempHumDto(null); + + try { + PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode); + if(pgDevice==null) + msg="设备不存在"; + else{ + pgTempHumDto=pgTempHumManager.getNewestTempHumData(pgDevice); + if(pgTempHumDto==null) + msg="没有满足要求的数据"; + else + msg="数据获取成功"; + } + }catch(Exception e){ + e.printStackTrace(); + msg="设备监测数据获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",pgTempHumDto); + return resultMap; + } + + /** * 新增数据 */ @POST diff --git "a/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" new file mode 100644 index 0000000..297f4aa --- /dev/null +++ "b/~$\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" index 0987d90..4cd43b6 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ