diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 63860f6..47e6bb1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -3,13 +3,12 @@ import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.manager.PgRoadManager; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgPartitionDto implements Serializable { +public class PgPartitionDto{ private String id; private String parName;//分区名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index b9428b6..ecdd8ee 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgPipeLine; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineDto implements Serializable { +public class PgPipeLineDto{ private String id; private String lineName;//管线唯一编号 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 63860f6..47e6bb1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -3,13 +3,12 @@ import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.manager.PgRoadManager; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgPartitionDto implements Serializable { +public class PgPartitionDto{ private String id; private String parName;//分区名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index b9428b6..ecdd8ee 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgPipeLine; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineDto implements Serializable { +public class PgPipeLineDto{ private String id; private String lineName;//管线唯一编号 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java index 0a61485..55736a1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java @@ -2,11 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgRoad; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class PgRoadDto implements Serializable { +public class PgRoadDto{ private long id; private String roadName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index ffd3a13..59d77be 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PipeGallery; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PipeGalleryDto implements Serializable { +public class PipeGalleryDto{ private String id; private String pgName;//管廊名称 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 63860f6..47e6bb1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -3,13 +3,12 @@ import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.manager.PgRoadManager; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgPartitionDto implements Serializable { +public class PgPartitionDto{ private String id; private String parName;//分区名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index b9428b6..ecdd8ee 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgPipeLine; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineDto implements Serializable { +public class PgPipeLineDto{ private String id; private String lineName;//管线唯一编号 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java index 0a61485..55736a1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java @@ -2,11 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgRoad; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class PgRoadDto implements Serializable { +public class PgRoadDto{ private long id; private String roadName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index ffd3a13..59d77be 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PipeGallery; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PipeGalleryDto implements Serializable { +public class PipeGalleryDto{ private String id; private String pgName;//管廊名称 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java index ed3b7f4..4e98ec0 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgAlarmRule; -import java.io.Serializable; - /** * Created by yxw on 2017/12/14. */ -public class PgAlarmRuleDto implements Serializable { +public class PgAlarmRuleDto{ private String id; private String highValue;//高限 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java index 2468612..5f9a790 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.patroler.domain.PgAuthority; -import java.io.Serializable; - /** * Created by yxw on 2018/3/30. */ -public class PgAuthorityDto implements Serializable { +public class PgAuthorityDto{ private String id; private String authority; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 63860f6..47e6bb1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -3,13 +3,12 @@ import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.manager.PgRoadManager; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgPartitionDto implements Serializable { +public class PgPartitionDto{ private String id; private String parName;//分区名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index b9428b6..ecdd8ee 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgPipeLine; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineDto implements Serializable { +public class PgPipeLineDto{ private String id; private String lineName;//管线唯一编号 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java index 0a61485..55736a1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java @@ -2,11 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgRoad; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class PgRoadDto implements Serializable { +public class PgRoadDto{ private long id; private String roadName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index ffd3a13..59d77be 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PipeGallery; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PipeGalleryDto implements Serializable { +public class PipeGalleryDto{ private String id; private String pgName;//管廊名称 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java index ed3b7f4..4e98ec0 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgAlarmRule; -import java.io.Serializable; - /** * Created by yxw on 2017/12/14. */ -public class PgAlarmRuleDto implements Serializable { +public class PgAlarmRuleDto{ private String id; private String highValue;//高限 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java index 2468612..5f9a790 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.patroler.domain.PgAuthority; -import java.io.Serializable; - /** * Created by yxw on 2018/3/30. */ -public class PgAuthorityDto implements Serializable { +public class PgAuthorityDto{ private String id; private String authority; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index a347ad2..c158f88 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import java.io.Serializable; - /** * Created by yxw on 2018/3/22. */ -public class PgInPgPersonDto implements Serializable { +public class PgInPgPersonDto{ private String id; private String userName;//入廊人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 8ba9d0a..9484c9e 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgLog; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgLogDto implements Serializable { +public class PgLogDto{ private String id; private String operate;//操作 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 63860f6..47e6bb1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -3,13 +3,12 @@ import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.manager.PgRoadManager; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgPartitionDto implements Serializable { +public class PgPartitionDto{ private String id; private String parName;//分区名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index b9428b6..ecdd8ee 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgPipeLine; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineDto implements Serializable { +public class PgPipeLineDto{ private String id; private String lineName;//管线唯一编号 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java index 0a61485..55736a1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java @@ -2,11 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgRoad; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class PgRoadDto implements Serializable { +public class PgRoadDto{ private long id; private String roadName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index ffd3a13..59d77be 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PipeGallery; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PipeGalleryDto implements Serializable { +public class PipeGalleryDto{ private String id; private String pgName;//管廊名称 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java index ed3b7f4..4e98ec0 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgAlarmRule; -import java.io.Serializable; - /** * Created by yxw on 2017/12/14. */ -public class PgAlarmRuleDto implements Serializable { +public class PgAlarmRuleDto{ private String id; private String highValue;//高限 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java index 2468612..5f9a790 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.patroler.domain.PgAuthority; -import java.io.Serializable; - /** * Created by yxw on 2018/3/30. */ -public class PgAuthorityDto implements Serializable { +public class PgAuthorityDto{ private String id; private String authority; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index a347ad2..c158f88 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import java.io.Serializable; - /** * Created by yxw on 2018/3/22. */ -public class PgInPgPersonDto implements Serializable { +public class PgInPgPersonDto{ private String id; private String userName;//入廊人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 8ba9d0a..9484c9e 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgLog; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgLogDto implements Serializable { +public class PgLogDto{ private String id; private String operate;//操作 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java index d82ab14..3bb7c16 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgMaintainDoc; -import java.io.Serializable; - /** * Created by Administrator on 2018/4/26. */ -public class PgMaintainDocDto implements Serializable { +public class PgMaintainDocDto{ private String id; private String mainTainer;//维护人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java index e4de792..b1faa0f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgMaintain; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/28. */ -public class PgMaintainDto implements Serializable { +public class PgMaintainDto{ private String id; private String mainTainer;//维护人员 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 63860f6..47e6bb1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -3,13 +3,12 @@ import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.manager.PgRoadManager; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgPartitionDto implements Serializable { +public class PgPartitionDto{ private String id; private String parName;//分区名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index b9428b6..ecdd8ee 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgPipeLine; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineDto implements Serializable { +public class PgPipeLineDto{ private String id; private String lineName;//管线唯一编号 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java index 0a61485..55736a1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java @@ -2,11 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgRoad; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class PgRoadDto implements Serializable { +public class PgRoadDto{ private long id; private String roadName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index ffd3a13..59d77be 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PipeGallery; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PipeGalleryDto implements Serializable { +public class PipeGalleryDto{ private String id; private String pgName;//管廊名称 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java index ed3b7f4..4e98ec0 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgAlarmRule; -import java.io.Serializable; - /** * Created by yxw on 2017/12/14. */ -public class PgAlarmRuleDto implements Serializable { +public class PgAlarmRuleDto{ private String id; private String highValue;//高限 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java index 2468612..5f9a790 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.patroler.domain.PgAuthority; -import java.io.Serializable; - /** * Created by yxw on 2018/3/30. */ -public class PgAuthorityDto implements Serializable { +public class PgAuthorityDto{ private String id; private String authority; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index a347ad2..c158f88 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import java.io.Serializable; - /** * Created by yxw on 2018/3/22. */ -public class PgInPgPersonDto implements Serializable { +public class PgInPgPersonDto{ private String id; private String userName;//入廊人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 8ba9d0a..9484c9e 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgLog; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgLogDto implements Serializable { +public class PgLogDto{ private String id; private String operate;//操作 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java index d82ab14..3bb7c16 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgMaintainDoc; -import java.io.Serializable; - /** * Created by Administrator on 2018/4/26. */ -public class PgMaintainDocDto implements Serializable { +public class PgMaintainDocDto{ private String id; private String mainTainer;//维护人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java index e4de792..b1faa0f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgMaintain; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/28. */ -public class PgMaintainDto implements Serializable { +public class PgMaintainDto{ private String id; private String mainTainer;//维护人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java index 5804d37..66f2365 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgMaintainType; -import java.io.Serializable; - /** * Created by yxw on 2018/8/21. */ -public class PgMaintainTypeDto implements Serializable { +public class PgMaintainTypeDto{ private long id; private String type; private String model; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java index c760b93..8ec77b2 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java @@ -3,12 +3,10 @@ import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgPatrolDoc; -import java.io.Serializable; - /** * Created by Administrator on 2018/4/24. */ -public class PgPatrolDocDto implements Serializable{ +public class PgPatrolDocDto{ private String id; private String list_name;//工单名称 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 63860f6..47e6bb1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -3,13 +3,12 @@ import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.manager.PgRoadManager; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgPartitionDto implements Serializable { +public class PgPartitionDto{ private String id; private String parName;//分区名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index b9428b6..ecdd8ee 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgPipeLine; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineDto implements Serializable { +public class PgPipeLineDto{ private String id; private String lineName;//管线唯一编号 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java index 0a61485..55736a1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java @@ -2,11 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgRoad; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class PgRoadDto implements Serializable { +public class PgRoadDto{ private long id; private String roadName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index ffd3a13..59d77be 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PipeGallery; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PipeGalleryDto implements Serializable { +public class PipeGalleryDto{ private String id; private String pgName;//管廊名称 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java index ed3b7f4..4e98ec0 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgAlarmRule; -import java.io.Serializable; - /** * Created by yxw on 2017/12/14. */ -public class PgAlarmRuleDto implements Serializable { +public class PgAlarmRuleDto{ private String id; private String highValue;//高限 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java index 2468612..5f9a790 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.patroler.domain.PgAuthority; -import java.io.Serializable; - /** * Created by yxw on 2018/3/30. */ -public class PgAuthorityDto implements Serializable { +public class PgAuthorityDto{ private String id; private String authority; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index a347ad2..c158f88 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import java.io.Serializable; - /** * Created by yxw on 2018/3/22. */ -public class PgInPgPersonDto implements Serializable { +public class PgInPgPersonDto{ private String id; private String userName;//入廊人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 8ba9d0a..9484c9e 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgLog; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgLogDto implements Serializable { +public class PgLogDto{ private String id; private String operate;//操作 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java index d82ab14..3bb7c16 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgMaintainDoc; -import java.io.Serializable; - /** * Created by Administrator on 2018/4/26. */ -public class PgMaintainDocDto implements Serializable { +public class PgMaintainDocDto{ private String id; private String mainTainer;//维护人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java index e4de792..b1faa0f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgMaintain; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/28. */ -public class PgMaintainDto implements Serializable { +public class PgMaintainDto{ private String id; private String mainTainer;//维护人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java index 5804d37..66f2365 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgMaintainType; -import java.io.Serializable; - /** * Created by yxw on 2018/8/21. */ -public class PgMaintainTypeDto implements Serializable { +public class PgMaintainTypeDto{ private long id; private String type; private String model; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java index c760b93..8ec77b2 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java @@ -3,12 +3,10 @@ import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgPatrolDoc; -import java.io.Serializable; - /** * Created by Administrator on 2018/4/24. */ -public class PgPatrolDocDto implements Serializable{ +public class PgPatrolDocDto{ private String id; private String list_name;//工单名称 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java index fbf4ad2..f682adc 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgPatrol; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/28. */ -public class PgPatrolDto implements Serializable { +public class PgPatrolDto{ private String id; private String patroler;//巡检人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java index 7c7e004..a03600a 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgRole; -import java.io.Serializable; - /** * Created by yxw on 2018/3/30. */ -public class PgRoleDto implements Serializable { +public class PgRoleDto{ private String id; private String role; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -440,7 +365,7 @@ - + @@ -879,14 +804,7 @@ - - - - 1517193532907 - 1521168093758 @@ -1224,11 +1142,18 @@ - - @@ -1241,9 +1166,8 @@ - - + @@ -1255,7 +1179,7 @@ - + @@ -1266,7 +1190,7 @@ - + @@ -1340,7 +1264,6 @@ - @@ -1365,7 +1288,8 @@ - @@ -1384,307 +1308,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1729,10 +1352,55 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1743,73 +1411,293 @@ - + - - - - - - - - - - - - - - + + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - + + + + + + + + + + + + + + + + - + + - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java index ac20708..0bb6158 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -112,7 +112,7 @@ default: break; } - sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*), from PG_CONSTRUCTION t where 1=1 "; + sql = "select to_char(t.CS_BEGINTIME, '" + dateType + "'),count(*) from PG_CONSTRUCTION t where 1=1 "; if(!startTime.equals("")) sql+=" and t.CS_BEGINTIME >= to_date('" + startTime + "', 'yyyy-mm-dd')"; @@ -139,8 +139,8 @@ String str="PAPARTITION_ID"; try { - String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ - "where active = 1 group by pgConstruction." + str; + String hql="select (select p.PARNAME from pg_partition p where p.id=t.PAPARTITION_ID) as parName," + + "count(*) as count from pg_construction t group by t.PAPARTITION_ID"; List objects=this.getSession().createSQLQuery(hql).list(); PgConstructionParStatisticDto pgConstructionParStatisticDto=null; 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 9894929..247eb08 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCh4; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCh4Dto implements Serializable { +public class PgCh4Dto{ private String id; private String value;//ch4 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 d48a51a..cfac225 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgCo; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgCoDto implements Serializable { +public class PgCoDto{ private String id; private String value;//co diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java index 72f857d..88efde7 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java @@ -8,7 +8,7 @@ /** * Created by yxw on 2017/11/2. */ -public class PgLocationDto implements Serializable { +public class PgLocationDto{ private String id; private String intoTime;//进入时间 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 c3a260d..4911886 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgO2; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgO2Dto implements Serializable { +public class PgO2Dto{ private String id; private String value;//O2 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 850d2cc..68f0e58 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgSh; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgShDto implements Serializable { +public class PgShDto{ private String id; private String value;//sh 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 ee2acff..a448411 100644 --- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java +++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devData.domain.PgTempHum; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/28. */ -public class PgTempHumDto implements Serializable { +public class PgTempHumDto{ private String id; private String valueTemp; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java index 2f212f5..57fd50d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgAlarm; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgAlarmDto implements Serializable { +public class PgAlarmDto{ private String id; private String alarmType;//报警类型 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java index dbbe896..467d579 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTjDto.java @@ -1,11 +1,9 @@ package com.casic.PgInterface.devTable.dto; -import java.io.Serializable; - /** * Created by yxw on 2017/11/22. */ -public class PgAlarmTjDto implements Serializable { +public class PgAlarmTjDto{ private String alarmNum;//发生报警次数 private String alarmDate;//报警月份 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java index 09dfd24..0c9b95d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgAlarmTypeDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.devTable.domain.PgAlarmType; -import java.io.Serializable; - /** * Created by yxw on 2017/11/8. */ -public class PgAlarmTypeDto implements Serializable { +public class PgAlarmTypeDto{ private String id; private String alarmType;//报警类型 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 8b8265b..5681a71 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgDevice; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgDeviceDto implements Serializable { +public class PgDeviceDto{ private String id; private String pipeGallery;//仓位 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java index 2112276..d962a8d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgDeviceTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgDeviceType; -import java.io.Serializable; - /** * Created by yxw on 2018/1/8. */ -public class PgDeviceTypeDto implements Serializable { +public class PgDeviceTypeDto{ private String id; private String devType; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java index 6256b9d..b6dd82c 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgEquipmentDto.java @@ -2,14 +2,13 @@ import com.casic.PgInterface.devTable.domain.PgEquipment; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/9/3. */ -public class PgEquipmentDto implements Serializable { +public class PgEquipmentDto{ private long id; private String eqName;//名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 63860f6..47e6bb1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -3,13 +3,12 @@ import com.casic.PgInterface.devTable.domain.PgPartition; import com.casic.PgInterface.devTable.manager.PgRoadManager; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgPartitionDto implements Serializable { +public class PgPartitionDto{ private String id; private String parName;//分区名称 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java index b9428b6..ecdd8ee 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPipeLineDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.devTable.domain.PgPipeLine; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/10/30. */ -public class PgPipeLineDto implements Serializable { +public class PgPipeLineDto{ private String id; private String lineName;//管线唯一编号 diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java index 0a61485..55736a1 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgRoadDto.java @@ -2,11 +2,10 @@ import com.casic.PgInterface.devTable.domain.PgRoad; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class PgRoadDto implements Serializable { +public class PgRoadDto{ private long id; private String roadName; diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java index ffd3a13..59d77be 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PipeGalleryDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.devTable.domain.PipeGallery; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PipeGalleryDto implements Serializable { +public class PipeGalleryDto{ private String id; private String pgName;//管廊名称 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java index ed3b7f4..4e98ec0 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRuleDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgAlarmRule; -import java.io.Serializable; - /** * Created by yxw on 2017/12/14. */ -public class PgAlarmRuleDto implements Serializable { +public class PgAlarmRuleDto{ private String id; private String highValue;//高限 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java index 2468612..5f9a790 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAuthorityDto.java @@ -2,13 +2,11 @@ import com.casic.PgInterface.patroler.domain.PgAuthority; -import java.io.Serializable; - /** * Created by yxw on 2018/3/30. */ -public class PgAuthorityDto implements Serializable { +public class PgAuthorityDto{ private String id; private String authority; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java index a347ad2..c158f88 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import java.io.Serializable; - /** * Created by yxw on 2018/3/22. */ -public class PgInPgPersonDto implements Serializable { +public class PgInPgPersonDto{ private String id; private String userName;//入廊人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java index 8ba9d0a..9484c9e 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgLogDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgLog; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2017/11/2. */ -public class PgLogDto implements Serializable { +public class PgLogDto{ private String id; private String operate;//操作 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java index d82ab14..3bb7c16 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDocDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgMaintainDoc; -import java.io.Serializable; - /** * Created by Administrator on 2018/4/26. */ -public class PgMaintainDocDto implements Serializable { +public class PgMaintainDocDto{ private String id; private String mainTainer;//维护人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java index e4de792..b1faa0f 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgMaintain; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/28. */ -public class PgMaintainDto implements Serializable { +public class PgMaintainDto{ private String id; private String mainTainer;//维护人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java index 5804d37..66f2365 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgMaintainTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgMaintainType; -import java.io.Serializable; - /** * Created by yxw on 2018/8/21. */ -public class PgMaintainTypeDto implements Serializable { +public class PgMaintainTypeDto{ private long id; private String type; private String model; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java index c760b93..8ec77b2 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDocDto.java @@ -3,12 +3,10 @@ import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgPatrolDoc; -import java.io.Serializable; - /** * Created by Administrator on 2018/4/24. */ -public class PgPatrolDocDto implements Serializable{ +public class PgPatrolDocDto{ private String id; private String list_name;//工单名称 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java index fbf4ad2..f682adc 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.patroler.domain.PgPatrol; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by yxw on 2018/3/28. */ -public class PgPatrolDto implements Serializable { +public class PgPatrolDto{ private String id; private String patroler;//巡检人员 diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java index 7c7e004..a03600a 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgRoleDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgRole; -import java.io.Serializable; - /** * Created by yxw on 2018/3/30. */ -public class PgRoleDto implements Serializable { +public class PgRoleDto{ private String id; private String role; diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java index d701c70..d75f2aa 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgUserDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.patroler.domain.PgUser; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PgUserDto implements Serializable { +public class PgUserDto{ private String id; private String userName;//用户名 diff --git a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java index 27f6739..64c1467 100644 --- a/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java +++ b/src/main/java/com/casic/PgInterface/reservePlan/dto/PgReservePlanDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.reservePlan.domain.PgReservePlan; -import java.io.Serializable; - /** * Created by yxw on 2017/11/2. */ -public class PgReservePlanDto implements Serializable { +public class PgReservePlanDto{ private String id; private String planName;//预案名称 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c32b2ee..99c29b1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,21 +6,38 @@ - - - - - - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +76,14 @@ - + - - + + @@ -74,14 +91,14 @@ - - + + - + @@ -92,66 +109,11 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -199,32 +161,6 @@ @@ -364,46 +328,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +