diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { 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 e67a3cb..2b85661 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -58,9 +58,10 @@ //获取设备最新数据 public PgCoDto getNewestCoData(PgDevice pgDevice) { try { - String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CO,LOGTIME,UPTIME from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCoList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgCoList.size()==0) return null; Object[] objects = pgCoList.get(0); PgCoDto pgCoDto=new PgCoDto(null); pgCoDto.setId(objects[0].toString()); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { 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 e67a3cb..2b85661 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -58,9 +58,10 @@ //获取设备最新数据 public PgCoDto getNewestCoData(PgDevice pgDevice) { try { - String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CO,LOGTIME,UPTIME from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCoList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgCoList.size()==0) return null; Object[] objects = pgCoList.get(0); PgCoDto pgCoDto=new PgCoDto(null); pgCoDto.setId(objects[0].toString()); 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 b4445b2..c969621 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -59,9 +59,10 @@ public PgO2Dto getNewestO2Data(PgDevice pgDevice) { try { - String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,O2,LOGTIME,UPTIME from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgO2List=(List)this.getSession().createSQLQuery(sql).list(); + if(pgO2List.size()==0) return null; Object[] objects = pgO2List.get(0); PgO2Dto pgO2Dto=new PgO2Dto(null); pgO2Dto.setId(objects[0].toString()); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { 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 e67a3cb..2b85661 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -58,9 +58,10 @@ //获取设备最新数据 public PgCoDto getNewestCoData(PgDevice pgDevice) { try { - String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CO,LOGTIME,UPTIME from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCoList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgCoList.size()==0) return null; Object[] objects = pgCoList.get(0); PgCoDto pgCoDto=new PgCoDto(null); pgCoDto.setId(objects[0].toString()); 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 b4445b2..c969621 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -59,9 +59,10 @@ public PgO2Dto getNewestO2Data(PgDevice pgDevice) { try { - String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,O2,LOGTIME,UPTIME from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgO2List=(List)this.getSession().createSQLQuery(sql).list(); + if(pgO2List.size()==0) return null; Object[] objects = pgO2List.get(0); PgO2Dto pgO2Dto=new PgO2Dto(null); pgO2Dto.setId(objects[0].toString()); 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 7b3d114..eeb398e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -58,9 +58,10 @@ public PgShDto getNewestShData(PgDevice pgDevice) { try { - String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,SH,LOGTIME,UPTIME from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgShList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgShList.size()==0) return null; Object[] objects = pgShList.get(0); PgShDto pgShDto=new PgShDto(null); pgShDto.setId(objects[0].toString()); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { 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 e67a3cb..2b85661 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -58,9 +58,10 @@ //获取设备最新数据 public PgCoDto getNewestCoData(PgDevice pgDevice) { try { - String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CO,LOGTIME,UPTIME from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCoList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgCoList.size()==0) return null; Object[] objects = pgCoList.get(0); PgCoDto pgCoDto=new PgCoDto(null); pgCoDto.setId(objects[0].toString()); 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 b4445b2..c969621 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -59,9 +59,10 @@ public PgO2Dto getNewestO2Data(PgDevice pgDevice) { try { - String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,O2,LOGTIME,UPTIME from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgO2List=(List)this.getSession().createSQLQuery(sql).list(); + if(pgO2List.size()==0) return null; Object[] objects = pgO2List.get(0); PgO2Dto pgO2Dto=new PgO2Dto(null); pgO2Dto.setId(objects[0].toString()); 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 7b3d114..eeb398e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -58,9 +58,10 @@ public PgShDto getNewestShData(PgDevice pgDevice) { try { - String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,SH,LOGTIME,UPTIME from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgShList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgShList.size()==0) return null; Object[] objects = pgShList.get(0); PgShDto pgShDto=new PgShDto(null); pgShDto.setId(objects[0].toString()); 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 1cbc193..99615c6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -60,9 +60,11 @@ public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { try { - String sql="select * from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,TEMP,HUM,LOGTIME,LOGTIME from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgTempHumList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgTempHumList.size()==0) return null; + Object[] objects = pgTempHumList.get(0); PgTempHumDto pgTempHumDto=new PgTempHumDto(null); pgTempHumDto.setId(objects[0].toString()); @@ -81,4 +83,4 @@ } } -} +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { 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 e67a3cb..2b85661 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -58,9 +58,10 @@ //获取设备最新数据 public PgCoDto getNewestCoData(PgDevice pgDevice) { try { - String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CO,LOGTIME,UPTIME from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCoList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgCoList.size()==0) return null; Object[] objects = pgCoList.get(0); PgCoDto pgCoDto=new PgCoDto(null); pgCoDto.setId(objects[0].toString()); 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 b4445b2..c969621 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -59,9 +59,10 @@ public PgO2Dto getNewestO2Data(PgDevice pgDevice) { try { - String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,O2,LOGTIME,UPTIME from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgO2List=(List)this.getSession().createSQLQuery(sql).list(); + if(pgO2List.size()==0) return null; Object[] objects = pgO2List.get(0); PgO2Dto pgO2Dto=new PgO2Dto(null); pgO2Dto.setId(objects[0].toString()); 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 7b3d114..eeb398e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -58,9 +58,10 @@ public PgShDto getNewestShData(PgDevice pgDevice) { try { - String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,SH,LOGTIME,UPTIME from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgShList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgShList.size()==0) return null; Object[] objects = pgShList.get(0); PgShDto pgShDto=new PgShDto(null); pgShDto.setId(objects[0].toString()); 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 1cbc193..99615c6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -60,9 +60,11 @@ public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { try { - String sql="select * from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,TEMP,HUM,LOGTIME,LOGTIME from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgTempHumList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgTempHumList.size()==0) return null; + Object[] objects = pgTempHumList.get(0); PgTempHumDto pgTempHumDto=new PgTempHumDto(null); pgTempHumDto.setId(objects[0].toString()); @@ -81,4 +83,4 @@ } } -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 6264274..913428b 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -16,7 +16,7 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String personType;//人员类别:临时人员、工作人员 + private String personType;//人员类别:监控人员、外巡人员和内巡（维修）人员 private int isInPg;//是否在廊内 private List pgInPgStatuses; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { 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 e67a3cb..2b85661 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -58,9 +58,10 @@ //获取设备最新数据 public PgCoDto getNewestCoData(PgDevice pgDevice) { try { - String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CO,LOGTIME,UPTIME from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCoList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgCoList.size()==0) return null; Object[] objects = pgCoList.get(0); PgCoDto pgCoDto=new PgCoDto(null); pgCoDto.setId(objects[0].toString()); 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 b4445b2..c969621 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -59,9 +59,10 @@ public PgO2Dto getNewestO2Data(PgDevice pgDevice) { try { - String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,O2,LOGTIME,UPTIME from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgO2List=(List)this.getSession().createSQLQuery(sql).list(); + if(pgO2List.size()==0) return null; Object[] objects = pgO2List.get(0); PgO2Dto pgO2Dto=new PgO2Dto(null); pgO2Dto.setId(objects[0].toString()); 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 7b3d114..eeb398e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -58,9 +58,10 @@ public PgShDto getNewestShData(PgDevice pgDevice) { try { - String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,SH,LOGTIME,UPTIME from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgShList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgShList.size()==0) return null; Object[] objects = pgShList.get(0); PgShDto pgShDto=new PgShDto(null); pgShDto.setId(objects[0].toString()); 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 1cbc193..99615c6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -60,9 +60,11 @@ public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { try { - String sql="select * from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,TEMP,HUM,LOGTIME,LOGTIME from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgTempHumList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgTempHumList.size()==0) return null; + Object[] objects = pgTempHumList.get(0); PgTempHumDto pgTempHumDto=new PgTempHumDto(null); pgTempHumDto.setId(objects[0].toString()); @@ -81,4 +83,4 @@ } } -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 6264274..913428b 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -16,7 +16,7 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String personType;//人员类别:临时人员、工作人员 + private String personType;//人员类别:监控人员、外巡人员和内巡（维修）人员 private int isInPg;//是否在廊内 private List pgInPgStatuses; 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..790d265 --- /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 e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { 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 e67a3cb..2b85661 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -58,9 +58,10 @@ //获取设备最新数据 public PgCoDto getNewestCoData(PgDevice pgDevice) { try { - String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CO,LOGTIME,UPTIME from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCoList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgCoList.size()==0) return null; Object[] objects = pgCoList.get(0); PgCoDto pgCoDto=new PgCoDto(null); pgCoDto.setId(objects[0].toString()); 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 b4445b2..c969621 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -59,9 +59,10 @@ public PgO2Dto getNewestO2Data(PgDevice pgDevice) { try { - String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,O2,LOGTIME,UPTIME from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgO2List=(List)this.getSession().createSQLQuery(sql).list(); + if(pgO2List.size()==0) return null; Object[] objects = pgO2List.get(0); PgO2Dto pgO2Dto=new PgO2Dto(null); pgO2Dto.setId(objects[0].toString()); 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 7b3d114..eeb398e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -58,9 +58,10 @@ public PgShDto getNewestShData(PgDevice pgDevice) { try { - String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,SH,LOGTIME,UPTIME from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgShList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgShList.size()==0) return null; Object[] objects = pgShList.get(0); PgShDto pgShDto=new PgShDto(null); pgShDto.setId(objects[0].toString()); 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 1cbc193..99615c6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -60,9 +60,11 @@ public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { try { - String sql="select * from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,TEMP,HUM,LOGTIME,LOGTIME from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgTempHumList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgTempHumList.size()==0) return null; + Object[] objects = pgTempHumList.get(0); PgTempHumDto pgTempHumDto=new PgTempHumDto(null); pgTempHumDto.setId(objects[0].toString()); @@ -81,4 +83,4 @@ } } -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 6264274..913428b 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -16,7 +16,7 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String personType;//人员类别:临时人员、工作人员 + private String personType;//人员类别:监控人员、外巡人员和内巡（维修）人员 private int isInPg;//是否在廊内 private List pgInPgStatuses; 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..790d265 --- /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/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" index 99e96b6..ef5c448 100644 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e592855..39e7f32 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,15 @@ - - - + + + + + + + + + @@ -29,7 +35,20 @@ - + + + + + + + + + + + + + + @@ -47,8 +66,6 @@ @@ -191,7 +210,6 @@ - @@ -241,6 +259,28 @@ + + + + + + + + + @@ -298,8 +338,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,7 +968,10 @@ - + + + + 1510219102698 @@ -1011,11 +1149,15 @@ 1531219605437 1531219605437 - - @@ -1047,23 +1189,24 @@ + - + - + - + @@ -1072,10 +1215,45 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1117,11 +1294,12 @@ - - @@ -1129,41 +1307,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1220,13 +1363,6 @@ - - - - - - - @@ -1276,25 +1412,10 @@ - - - - - - - - - - - - - - - @@ -1302,7 +1423,6 @@ - @@ -1327,34 +1447,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1362,20 +1454,6 @@ - - - - - - - - - - - - - - @@ -1397,13 +1475,6 @@ - - - - - - - @@ -1425,41 +1496,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1471,24 +1507,6 @@ - - - - - - - - - - - - - - - - - - @@ -1496,10 +1514,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 8b3f7ee..6062dda 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCh4Manager.java @@ -61,9 +61,11 @@ public PgCh4Dto getNewestCH4Data(PgDevice pgDevice) { try { - String sql="select * from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CH4,LOGTIME,UPTIME from PG_CH4 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCh4List=(List)this.getSession().createSQLQuery(sql).list(); + + if(pgCh4List.size()==0) return null; Object[] objects = pgCh4List.get(0); PgCh4Dto pgCh4Dto=new PgCh4Dto(null); pgCh4Dto.setId(objects[0].toString()); @@ -75,7 +77,6 @@ //获取devName和devCode return pgCh4Dto; - } catch(Exception ex) { 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 e67a3cb..2b85661 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgCoManager.java @@ -58,9 +58,10 @@ //获取设备最新数据 public PgCoDto getNewestCoData(PgDevice pgDevice) { try { - String sql="select * from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,CO,LOGTIME,UPTIME from PG_CO where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgCoList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgCoList.size()==0) return null; Object[] objects = pgCoList.get(0); PgCoDto pgCoDto=new PgCoDto(null); pgCoDto.setId(objects[0].toString()); 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 b4445b2..c969621 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgO2Manager.java @@ -59,9 +59,10 @@ public PgO2Dto getNewestO2Data(PgDevice pgDevice) { try { - String sql="select * from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,O2,LOGTIME,UPTIME from PG_O2 where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgO2List=(List)this.getSession().createSQLQuery(sql).list(); + if(pgO2List.size()==0) return null; Object[] objects = pgO2List.get(0); PgO2Dto pgO2Dto=new PgO2Dto(null); pgO2Dto.setId(objects[0].toString()); 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 7b3d114..eeb398e 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgShManager.java @@ -58,9 +58,10 @@ public PgShDto getNewestShData(PgDevice pgDevice) { try { - String sql="select * from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,SH,LOGTIME,UPTIME from PG_Sh where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgShList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgShList.size()==0) return null; Object[] objects = pgShList.get(0); PgShDto pgShDto=new PgShDto(null); pgShDto.setId(objects[0].toString()); 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 1cbc193..99615c6 100644 --- a/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java +++ b/src/main/java/com/casic/PgInterface/devData/manager/PgTempHumManager.java @@ -60,9 +60,11 @@ public PgTempHumDto getNewestTempHumData(PgDevice pgDevice) { try { - String sql="select * from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; + String sql="select id,TEMP,HUM,LOGTIME,LOGTIME from PG_TEMPHUM where PGDEVICEID = '"+pgDevice.getId()+"' AND rownum < 2 order by UPTIME"; List pgTempHumList=(List)this.getSession().createSQLQuery(sql).list(); + if(pgTempHumList.size()==0) return null; + Object[] objects = pgTempHumList.get(0); PgTempHumDto pgTempHumDto=new PgTempHumDto(null); pgTempHumDto.setId(objects[0].toString()); @@ -81,4 +83,4 @@ } } -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java index 6264274..913428b 100644 --- a/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java +++ b/src/main/java/com/casic/PgInterface/patroler/domain/PgInPgPerson.java @@ -16,7 +16,7 @@ private long id; private String userName;//入廊人员 private String phoneNumber;//联系方式 - private String personType;//人员类别:临时人员、工作人员 + private String personType;//人员类别:监控人员、外巡人员和内巡（维修）人员 private int isInPg;//是否在廊内 private List pgInPgStatuses; 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..790d265 --- /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/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" index 99e96b6..ef5c448 100644 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ diff --git "a/\350\256\276\345\244\207\346\216\247\345\210\266\346\216\245\345\217\243.docx" "b/\350\256\276\345\244\207\346\216\247\345\210\266\346\216\245\345\217\243.docx" new file mode 100644 index 0000000..f0ff4e8 --- /dev/null +++ "b/\350\256\276\345\244\207\346\216\247\345\210\266\346\216\245\345\217\243.docx" Binary files differ