diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2b77de9..c32b2ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,27 +6,21 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - @@ -46,8 +40,9 @@ - + + @@ -58,34 +53,35 @@ - + - + - - + + - - + + + - + @@ -96,11 +92,66 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,12 +172,15 @@ getPersonNumInPgByMonth getConstructionToday constructionType - getConstructionNum getPipeGallerys getInPgNum getTodayInPgInfo getInPgPerson getAlarmInfo + PgConstructTjDto + getConstructionNum + getConstructionByType + getConstructionByTimeAndStatus @@ -146,7 +200,6 @@ @@ -243,10 +311,10 @@ - @@ -351,7 +440,7 @@ - + @@ -789,14 +878,8 @@ - - - - 1514511858811 - 1517193532907 @@ -1134,11 +1217,18 @@ - - @@ -1151,13 +1241,14 @@ + - + - + @@ -1193,19 +1284,19 @@ - + - + - + @@ -1214,9 +1305,9 @@ - + - + @@ -1249,7 +1340,6 @@ - @@ -1274,7 +1364,8 @@ - @@ -1293,77 +1384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1413,27 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1459,11 +1458,6 @@ - - - - - @@ -1492,12 +1486,6 @@ - - - - - - @@ -1505,9 +1493,6 @@ - - - @@ -1515,13 +1500,6 @@ - - - - - - - @@ -1548,10 +1526,6 @@ - - - - @@ -1573,12 +1547,6 @@ - - - - - - @@ -1612,16 +1580,6 @@ - - - - - - - - - - @@ -1681,12 +1639,6 @@ - - - - - - @@ -1709,9 +1661,6 @@ - - - @@ -1722,10 +1671,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java deleted file mode 100644 index 0844d9b..0000000 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.PgInterface.construction.dto; - -import java.io.Serializable; - -/** - * Created by Administrator on 2018/3/30. - */ -public class PgConstructTjDto implements Serializable { - - private String constructNum;//施工数量 - private String constructionTime;//时间 - private String constructType;//施工类型 - private String constructStatus;//施工状态 - private String constructPartition;//施工区域 - - public String getConstructNum(){ return constructNum; } - - public void setConstructNum(String constructNum){ this.constructNum = constructNum;} - - public String getConstructionTime() { - return constructionTime; - } - - public void setConstructionTime(String constructionTime) { - this.constructionTime = constructionTime; - } - - public String getConstructType() { - return constructType; - } - - public void setConstructType(String constructType) { - this.constructType = constructType; - } - - public String getConstructStatus() { - return constructStatus; - } - - public void setConstructStatus(String constructStatus) { - this.constructStatus = constructStatus; - } - - public String getConstructPartition() { - return constructPartition; - } - - public void setConstructPartition(String constructPartition) { - this.constructPartition = constructPartition; - } -} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2b77de9..c32b2ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,27 +6,21 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - @@ -46,8 +40,9 @@ - + + @@ -58,34 +53,35 @@ - + - + - - + + - - + + + - + @@ -96,11 +92,66 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,12 +172,15 @@ getPersonNumInPgByMonth getConstructionToday constructionType - getConstructionNum getPipeGallerys getInPgNum getTodayInPgInfo getInPgPerson getAlarmInfo + PgConstructTjDto + getConstructionNum + getConstructionByType + getConstructionByTimeAndStatus @@ -146,7 +200,6 @@ @@ -243,10 +311,10 @@ - @@ -351,7 +440,7 @@ - + @@ -789,14 +878,8 @@ - - - - 1514511858811 - 1517193532907 @@ -1134,11 +1217,18 @@ - - @@ -1151,13 +1241,14 @@ + - + - + @@ -1193,19 +1284,19 @@ - + - + - + @@ -1214,9 +1305,9 @@ - + - + @@ -1249,7 +1340,6 @@ - @@ -1274,7 +1364,8 @@ - @@ -1293,77 +1384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1413,27 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1459,11 +1458,6 @@ - - - - - @@ -1492,12 +1486,6 @@ - - - - - - @@ -1505,9 +1493,6 @@ - - - @@ -1515,13 +1500,6 @@ - - - - - - - @@ -1548,10 +1526,6 @@ - - - - @@ -1573,12 +1547,6 @@ - - - - - - @@ -1612,16 +1580,6 @@ - - - - - - - - - - @@ -1681,12 +1639,6 @@ - - - - - - @@ -1709,9 +1661,6 @@ - - - @@ -1722,10 +1671,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java deleted file mode 100644 index 0844d9b..0000000 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.PgInterface.construction.dto; - -import java.io.Serializable; - -/** - * Created by Administrator on 2018/3/30. - */ -public class PgConstructTjDto implements Serializable { - - private String constructNum;//施工数量 - private String constructionTime;//时间 - private String constructType;//施工类型 - private String constructStatus;//施工状态 - private String constructPartition;//施工区域 - - public String getConstructNum(){ return constructNum; } - - public void setConstructNum(String constructNum){ this.constructNum = constructNum;} - - public String getConstructionTime() { - return constructionTime; - } - - public void setConstructionTime(String constructionTime) { - this.constructionTime = constructionTime; - } - - public String getConstructType() { - return constructType; - } - - public void setConstructType(String constructType) { - this.constructType = constructType; - } - - public String getConstructStatus() { - return constructStatus; - } - - public void setConstructStatus(String constructStatus) { - this.constructStatus = constructStatus; - } - - public String getConstructPartition() { - return constructPartition; - } - - public void setConstructPartition(String constructPartition) { - this.constructPartition = constructPartition; - } -} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java new file mode 100644 index 0000000..02e9667 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionDateStatistic extends PgConstructionStiatistic{ + + private String constructionTime;//时间 + + public String getConstructionTime() { + return constructionTime; + } + + public void setConstructionTime(String constructionTime) { + this.constructionTime = constructionTime; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java index e1962cc..2e23fca 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java @@ -2,12 +2,11 @@ import com.casic.PgInterface.construction.domain.PgConstruction; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/23. */ -public class PgConstructionDto implements Serializable{ +public class PgConstructionDto{ private String id; private String cs_name;//项目名称 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2b77de9..c32b2ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,27 +6,21 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - @@ -46,8 +40,9 @@ - + + @@ -58,34 +53,35 @@ - + - + - - + + - - + + + - + @@ -96,11 +92,66 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,12 +172,15 @@ getPersonNumInPgByMonth getConstructionToday constructionType - getConstructionNum getPipeGallerys getInPgNum getTodayInPgInfo getInPgPerson getAlarmInfo + PgConstructTjDto + getConstructionNum + getConstructionByType + getConstructionByTimeAndStatus @@ -146,7 +200,6 @@ @@ -243,10 +311,10 @@ - @@ -351,7 +440,7 @@ - + @@ -789,14 +878,8 @@ - - - - 1514511858811 - 1517193532907 @@ -1134,11 +1217,18 @@ - - @@ -1151,13 +1241,14 @@ + - + - + @@ -1193,19 +1284,19 @@ - + - + - + @@ -1214,9 +1305,9 @@ - + - + @@ -1249,7 +1340,6 @@ - @@ -1274,7 +1364,8 @@ - @@ -1293,77 +1384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1413,27 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1459,11 +1458,6 @@ - - - - - @@ -1492,12 +1486,6 @@ - - - - - - @@ -1505,9 +1493,6 @@ - - - @@ -1515,13 +1500,6 @@ - - - - - - - @@ -1548,10 +1526,6 @@ - - - - @@ -1573,12 +1547,6 @@ - - - - - - @@ -1612,16 +1580,6 @@ - - - - - - - - - - @@ -1681,12 +1639,6 @@ - - - - - - @@ -1709,9 +1661,6 @@ - - - @@ -1722,10 +1671,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java deleted file mode 100644 index 0844d9b..0000000 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.PgInterface.construction.dto; - -import java.io.Serializable; - -/** - * Created by Administrator on 2018/3/30. - */ -public class PgConstructTjDto implements Serializable { - - private String constructNum;//施工数量 - private String constructionTime;//时间 - private String constructType;//施工类型 - private String constructStatus;//施工状态 - private String constructPartition;//施工区域 - - public String getConstructNum(){ return constructNum; } - - public void setConstructNum(String constructNum){ this.constructNum = constructNum;} - - public String getConstructionTime() { - return constructionTime; - } - - public void setConstructionTime(String constructionTime) { - this.constructionTime = constructionTime; - } - - public String getConstructType() { - return constructType; - } - - public void setConstructType(String constructType) { - this.constructType = constructType; - } - - public String getConstructStatus() { - return constructStatus; - } - - public void setConstructStatus(String constructStatus) { - this.constructStatus = constructStatus; - } - - public String getConstructPartition() { - return constructPartition; - } - - public void setConstructPartition(String constructPartition) { - this.constructPartition = constructPartition; - } -} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java new file mode 100644 index 0000000..02e9667 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionDateStatistic extends PgConstructionStiatistic{ + + private String constructionTime;//时间 + + public String getConstructionTime() { + return constructionTime; + } + + public void setConstructionTime(String constructionTime) { + this.constructionTime = constructionTime; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java index e1962cc..2e23fca 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java @@ -2,12 +2,11 @@ import com.casic.PgInterface.construction.domain.PgConstruction; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/23. */ -public class PgConstructionDto implements Serializable{ +public class PgConstructionDto{ private String id; private String cs_name;//项目名称 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java new file mode 100644 index 0000000..0e0bfa0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionParStatisticDto extends PgConstructionStiatistic{ + + private String constructPartition;//施工区域 + + public String getConstructPartition() { + return constructPartition; + } + + public void setConstructPartition(String constructPartition) { + this.constructPartition = constructPartition; + } + +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java new file mode 100644 index 0000000..a8e8749 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionStiatistic { + + private String constructNum; + + public String getConstructNum() { + return constructNum; + } + + public void setConstructNum(String constructNum) { + this.constructNum = constructNum; + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2b77de9..c32b2ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,27 +6,21 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - @@ -46,8 +40,9 @@ - + + @@ -58,34 +53,35 @@ - + - + - - + + - - + + + - + @@ -96,11 +92,66 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,12 +172,15 @@ getPersonNumInPgByMonth getConstructionToday constructionType - getConstructionNum getPipeGallerys getInPgNum getTodayInPgInfo getInPgPerson getAlarmInfo + PgConstructTjDto + getConstructionNum + getConstructionByType + getConstructionByTimeAndStatus @@ -146,7 +200,6 @@ @@ -243,10 +311,10 @@ - @@ -351,7 +440,7 @@ - + @@ -789,14 +878,8 @@ - - - - 1514511858811 - 1517193532907 @@ -1134,11 +1217,18 @@ - - @@ -1151,13 +1241,14 @@ + - + - + @@ -1193,19 +1284,19 @@ - + - + - + @@ -1214,9 +1305,9 @@ - + - + @@ -1249,7 +1340,6 @@ - @@ -1274,7 +1364,8 @@ - @@ -1293,77 +1384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1413,27 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1459,11 +1458,6 @@ - - - - - @@ -1492,12 +1486,6 @@ - - - - - - @@ -1505,9 +1493,6 @@ - - - @@ -1515,13 +1500,6 @@ - - - - - - - @@ -1548,10 +1526,6 @@ - - - - @@ -1573,12 +1547,6 @@ - - - - - - @@ -1612,16 +1580,6 @@ - - - - - - - - - - @@ -1681,12 +1639,6 @@ - - - - - - @@ -1709,9 +1661,6 @@ - - - @@ -1722,10 +1671,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java deleted file mode 100644 index 0844d9b..0000000 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.PgInterface.construction.dto; - -import java.io.Serializable; - -/** - * Created by Administrator on 2018/3/30. - */ -public class PgConstructTjDto implements Serializable { - - private String constructNum;//施工数量 - private String constructionTime;//时间 - private String constructType;//施工类型 - private String constructStatus;//施工状态 - private String constructPartition;//施工区域 - - public String getConstructNum(){ return constructNum; } - - public void setConstructNum(String constructNum){ this.constructNum = constructNum;} - - public String getConstructionTime() { - return constructionTime; - } - - public void setConstructionTime(String constructionTime) { - this.constructionTime = constructionTime; - } - - public String getConstructType() { - return constructType; - } - - public void setConstructType(String constructType) { - this.constructType = constructType; - } - - public String getConstructStatus() { - return constructStatus; - } - - public void setConstructStatus(String constructStatus) { - this.constructStatus = constructStatus; - } - - public String getConstructPartition() { - return constructPartition; - } - - public void setConstructPartition(String constructPartition) { - this.constructPartition = constructPartition; - } -} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java new file mode 100644 index 0000000..02e9667 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionDateStatistic extends PgConstructionStiatistic{ + + private String constructionTime;//时间 + + public String getConstructionTime() { + return constructionTime; + } + + public void setConstructionTime(String constructionTime) { + this.constructionTime = constructionTime; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java index e1962cc..2e23fca 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java @@ -2,12 +2,11 @@ import com.casic.PgInterface.construction.domain.PgConstruction; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/23. */ -public class PgConstructionDto implements Serializable{ +public class PgConstructionDto{ private String id; private String cs_name;//项目名称 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java new file mode 100644 index 0000000..0e0bfa0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionParStatisticDto extends PgConstructionStiatistic{ + + private String constructPartition;//施工区域 + + public String getConstructPartition() { + return constructPartition; + } + + public void setConstructPartition(String constructPartition) { + this.constructPartition = constructPartition; + } + +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java new file mode 100644 index 0000000..a8e8749 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionStiatistic { + + private String constructNum; + + public String getConstructNum() { + return constructNum; + } + + public void setConstructNum(String constructNum) { + this.constructNum = constructNum; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java index 109c774..b7d79bb 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.construction.domain.PgConstructionType; -import java.io.Serializable; - /** * Created by yxw on 2018/4/10. */ -public class PgConstructionTypeDto implements Serializable { +public class PgConstructionTypeDto{ private String id; private String typeName;//项目状态 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java new file mode 100644 index 0000000..3b5944a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionTypeNumStatisticDto extends PgConstructionStiatistic{ + + + private String constructStatus;//施工状态 + + public String getConstructStatus() { + return constructStatus; + } + + public void setConstructStatus(String constructStatus) { + this.constructStatus = constructStatus; + } +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2b77de9..c32b2ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,27 +6,21 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - @@ -46,8 +40,9 @@ - + + @@ -58,34 +53,35 @@ - + - + - - + + - - + + + - + @@ -96,11 +92,66 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,12 +172,15 @@ getPersonNumInPgByMonth getConstructionToday constructionType - getConstructionNum getPipeGallerys getInPgNum getTodayInPgInfo getInPgPerson getAlarmInfo + PgConstructTjDto + getConstructionNum + getConstructionByType + getConstructionByTimeAndStatus @@ -146,7 +200,6 @@ @@ -243,10 +311,10 @@ - @@ -351,7 +440,7 @@ - + @@ -789,14 +878,8 @@ - - - - 1514511858811 - 1517193532907 @@ -1134,11 +1217,18 @@ - - @@ -1151,13 +1241,14 @@ + - + - + @@ -1193,19 +1284,19 @@ - + - + - + @@ -1214,9 +1305,9 @@ - + - + @@ -1249,7 +1340,6 @@ - @@ -1274,7 +1364,8 @@ - @@ -1293,77 +1384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1413,27 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1459,11 +1458,6 @@ - - - - - @@ -1492,12 +1486,6 @@ - - - - - - @@ -1505,9 +1493,6 @@ - - - @@ -1515,13 +1500,6 @@ - - - - - - - @@ -1548,10 +1526,6 @@ - - - - @@ -1573,12 +1547,6 @@ - - - - - - @@ -1612,16 +1580,6 @@ - - - - - - - - - - @@ -1681,12 +1639,6 @@ - - - - - - @@ -1709,9 +1661,6 @@ - - - @@ -1722,10 +1671,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java deleted file mode 100644 index 0844d9b..0000000 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.PgInterface.construction.dto; - -import java.io.Serializable; - -/** - * Created by Administrator on 2018/3/30. - */ -public class PgConstructTjDto implements Serializable { - - private String constructNum;//施工数量 - private String constructionTime;//时间 - private String constructType;//施工类型 - private String constructStatus;//施工状态 - private String constructPartition;//施工区域 - - public String getConstructNum(){ return constructNum; } - - public void setConstructNum(String constructNum){ this.constructNum = constructNum;} - - public String getConstructionTime() { - return constructionTime; - } - - public void setConstructionTime(String constructionTime) { - this.constructionTime = constructionTime; - } - - public String getConstructType() { - return constructType; - } - - public void setConstructType(String constructType) { - this.constructType = constructType; - } - - public String getConstructStatus() { - return constructStatus; - } - - public void setConstructStatus(String constructStatus) { - this.constructStatus = constructStatus; - } - - public String getConstructPartition() { - return constructPartition; - } - - public void setConstructPartition(String constructPartition) { - this.constructPartition = constructPartition; - } -} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java new file mode 100644 index 0000000..02e9667 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionDateStatistic extends PgConstructionStiatistic{ + + private String constructionTime;//时间 + + public String getConstructionTime() { + return constructionTime; + } + + public void setConstructionTime(String constructionTime) { + this.constructionTime = constructionTime; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java index e1962cc..2e23fca 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java @@ -2,12 +2,11 @@ import com.casic.PgInterface.construction.domain.PgConstruction; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/23. */ -public class PgConstructionDto implements Serializable{ +public class PgConstructionDto{ private String id; private String cs_name;//项目名称 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java new file mode 100644 index 0000000..0e0bfa0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionParStatisticDto extends PgConstructionStiatistic{ + + private String constructPartition;//施工区域 + + public String getConstructPartition() { + return constructPartition; + } + + public void setConstructPartition(String constructPartition) { + this.constructPartition = constructPartition; + } + +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java new file mode 100644 index 0000000..a8e8749 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionStiatistic { + + private String constructNum; + + public String getConstructNum() { + return constructNum; + } + + public void setConstructNum(String constructNum) { + this.constructNum = constructNum; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java index 109c774..b7d79bb 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.construction.domain.PgConstructionType; -import java.io.Serializable; - /** * Created by yxw on 2018/4/10. */ -public class PgConstructionTypeDto implements Serializable { +public class PgConstructionTypeDto{ private String id; private String typeName;//项目状态 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java new file mode 100644 index 0000000..3b5944a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionTypeNumStatisticDto extends PgConstructionStiatistic{ + + + private String constructStatus;//施工状态 + + public String getConstructStatus() { + return constructStatus; + } + + public void setConstructStatus(String constructStatus) { + this.constructStatus = constructStatus; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java new file mode 100644 index 0000000..94ca1ff --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java @@ -0,0 +1,17 @@ +package com.casic.PgInterface.construction.dto; + +/** + * Created by Administrator on 2018/3/30. + */ +public class PgConstructionTypeStatisticDto extends PgConstructionStiatistic{ + + private String constructType;//施工类型 + + public String getConstructType() { + return constructType; + } + + public void setConstructType(String constructType) { + this.constructType = constructType; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java index 10a4f4b..c07d5c2 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.construction.domain.PgCsDocument; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/28. */ -public class PgCsDocumentDto implements Serializable{ +public class PgCsDocumentDto{ private String id; private String list_name;//表单名称 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2b77de9..c32b2ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,27 +6,21 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - @@ -46,8 +40,9 @@ - + + @@ -58,34 +53,35 @@ - + - + - - + + - - + + + - + @@ -96,11 +92,66 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,12 +172,15 @@ getPersonNumInPgByMonth getConstructionToday constructionType - getConstructionNum getPipeGallerys getInPgNum getTodayInPgInfo getInPgPerson getAlarmInfo + PgConstructTjDto + getConstructionNum + getConstructionByType + getConstructionByTimeAndStatus @@ -146,7 +200,6 @@ @@ -243,10 +311,10 @@ - @@ -351,7 +440,7 @@ - + @@ -789,14 +878,8 @@ - - - - 1514511858811 - 1517193532907 @@ -1134,11 +1217,18 @@ - - @@ -1151,13 +1241,14 @@ + - + - + @@ -1193,19 +1284,19 @@ - + - + - + @@ -1214,9 +1305,9 @@ - + - + @@ -1249,7 +1340,6 @@ - @@ -1274,7 +1364,8 @@ - @@ -1293,77 +1384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1413,27 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1459,11 +1458,6 @@ - - - - - @@ -1492,12 +1486,6 @@ - - - - - - @@ -1505,9 +1493,6 @@ - - - @@ -1515,13 +1500,6 @@ - - - - - - - @@ -1548,10 +1526,6 @@ - - - - @@ -1573,12 +1547,6 @@ - - - - - - @@ -1612,16 +1580,6 @@ - - - - - - - - - - @@ -1681,12 +1639,6 @@ - - - - - - @@ -1709,9 +1661,6 @@ - - - @@ -1722,10 +1671,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java deleted file mode 100644 index 0844d9b..0000000 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.PgInterface.construction.dto; - -import java.io.Serializable; - -/** - * Created by Administrator on 2018/3/30. - */ -public class PgConstructTjDto implements Serializable { - - private String constructNum;//施工数量 - private String constructionTime;//时间 - private String constructType;//施工类型 - private String constructStatus;//施工状态 - private String constructPartition;//施工区域 - - public String getConstructNum(){ return constructNum; } - - public void setConstructNum(String constructNum){ this.constructNum = constructNum;} - - public String getConstructionTime() { - return constructionTime; - } - - public void setConstructionTime(String constructionTime) { - this.constructionTime = constructionTime; - } - - public String getConstructType() { - return constructType; - } - - public void setConstructType(String constructType) { - this.constructType = constructType; - } - - public String getConstructStatus() { - return constructStatus; - } - - public void setConstructStatus(String constructStatus) { - this.constructStatus = constructStatus; - } - - public String getConstructPartition() { - return constructPartition; - } - - public void setConstructPartition(String constructPartition) { - this.constructPartition = constructPartition; - } -} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java new file mode 100644 index 0000000..02e9667 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionDateStatistic extends PgConstructionStiatistic{ + + private String constructionTime;//时间 + + public String getConstructionTime() { + return constructionTime; + } + + public void setConstructionTime(String constructionTime) { + this.constructionTime = constructionTime; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java index e1962cc..2e23fca 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java @@ -2,12 +2,11 @@ import com.casic.PgInterface.construction.domain.PgConstruction; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/23. */ -public class PgConstructionDto implements Serializable{ +public class PgConstructionDto{ private String id; private String cs_name;//项目名称 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java new file mode 100644 index 0000000..0e0bfa0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionParStatisticDto extends PgConstructionStiatistic{ + + private String constructPartition;//施工区域 + + public String getConstructPartition() { + return constructPartition; + } + + public void setConstructPartition(String constructPartition) { + this.constructPartition = constructPartition; + } + +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java new file mode 100644 index 0000000..a8e8749 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionStiatistic { + + private String constructNum; + + public String getConstructNum() { + return constructNum; + } + + public void setConstructNum(String constructNum) { + this.constructNum = constructNum; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java index 109c774..b7d79bb 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.construction.domain.PgConstructionType; -import java.io.Serializable; - /** * Created by yxw on 2018/4/10. */ -public class PgConstructionTypeDto implements Serializable { +public class PgConstructionTypeDto{ private String id; private String typeName;//项目状态 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java new file mode 100644 index 0000000..3b5944a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionTypeNumStatisticDto extends PgConstructionStiatistic{ + + + private String constructStatus;//施工状态 + + public String getConstructStatus() { + return constructStatus; + } + + public void setConstructStatus(String constructStatus) { + this.constructStatus = constructStatus; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java new file mode 100644 index 0000000..94ca1ff --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java @@ -0,0 +1,17 @@ +package com.casic.PgInterface.construction.dto; + +/** + * Created by Administrator on 2018/3/30. + */ +public class PgConstructionTypeStatisticDto extends PgConstructionStiatistic{ + + private String constructType;//施工类型 + + public String getConstructType() { + return constructType; + } + + public void setConstructType(String constructType) { + this.constructType = constructType; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java index 10a4f4b..c07d5c2 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.construction.domain.PgCsDocument; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/28. */ -public class PgCsDocumentDto implements Serializable{ +public class PgCsDocumentDto{ private String id; private String list_name;//表单名称 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 46b841f..ac20708 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -1,9 +1,7 @@ package com.casic.PgInterface.construction.manager; import com.casic.PgInterface.construction.domain.PgConstruction; -import com.casic.PgInterface.construction.domain.PgConstructionType; -import com.casic.PgInterface.construction.dto.PgConstructTjDto; -import com.casic.PgInterface.construction.dto.PgConstructionDto; +import com.casic.PgInterface.construction.dto.*; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; @@ -25,20 +23,12 @@ @Service public class PgConstructionManager extends HibernateEntityDao { + @Resource private PgPartitionManager pgPartitionManager; + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - public PgConstruction getPgContructionByName(String name) { Criteria criteria = createCriteria(PgConstruction.class); criteria.add(Restrictions.eq("cs_name", name)); @@ -98,12 +88,12 @@ } //yyyy-mm-dd - public List getConstructionByTimeAndStatus(String startTime, String endTime, String statisticType) { + public List getConstructionByTimeAndStatus(String startTime, String endTime, String statisticType) { String sql = ""; String dateType = ""; - List pgConstructTjDtoList = new ArrayList(); + List pgConstructionStiatisticList = new ArrayList(); int type = Integer.valueOf(statisticType); switch (type) { @@ -122,10 +112,7 @@ default: break; } - sql = "select count(*), to_char(t.CS_BEGINTIME, '" + dateType + "') from PG_CONSTRUCTION t where 1=1 "; - /*"t.CS_BEGINTIME >= " + - "to_date('" + startTime + "', 'yyyy-mm-dd') and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd') " + - "and t.CS_STATUS = '" + constructionStatus + "' group by to_char(t.CS_BEGINTIME, '" + dateType + "')";*/ + 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')"; @@ -137,58 +124,81 @@ List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgConstructTjDto pgConstructTjDto = new PgConstructTjDto(); - pgConstructTjDto.setConstructNum(objects.get(i)[0].toString()); - pgConstructTjDto.setConstructionTime(objects.get(i)[1].toString()); -// pgConstructTjDto.setConstructStatus(constructionStatus); + PgConstructionDateStatistic pgConstructionDateStatistic = new PgConstructionDateStatistic(); - pgConstructTjDtoList.add(pgConstructTjDto); + pgConstructionDateStatistic.setConstructionTime(objects.get(i)[0].toString()); + pgConstructionDateStatistic.setConstructNum(objects.get(i)[1].toString()); + + pgConstructionStiatisticList.add(pgConstructionDateStatistic); } - return pgConstructTjDtoList; + return pgConstructionStiatisticList; } - public List getStatisticByPartitionOrType(String statisticType) { - List pgConstructTjDtoList = new ArrayList(); - String str=statisticType.equals("0")?"CS_TYPE":"PAPARTITION_ID"; - try { + public List getStatisticByPar(String statisticType){ + List pgConstructionStiatisticList = new ArrayList(); + String str="PAPARTITION_ID"; - String hql="select count(*), pgConstruction." + str + " from Pg_Construction pgConstruction "+ + try { + String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ "where active = 1 group by pgConstruction." + str; List objects=this.getSession().createSQLQuery(hql).list(); + PgConstructionParStatisticDto pgConstructionParStatisticDto=null; for(int i=0;i getStatisticByType(String statisticType) { + List pgConstructionStiatisticList = new ArrayList(); - Criteria criteria = createCriteria(PgConstruction.class); - //criteria.add(Restrictions.eq("active", 1)); - if(pgConstructionType!=null) - criteria.add(Restrictions.eq("pgConstructionTypeId",pgConstructionType)); + String str="CS_TYPE"; - List pgConstructionList=criteria.list(); - if(pgConstructionList==null) - return 0; - else - return pgConstructionList.size(); + try { + String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ + "where active = 1 group by pgConstruction." + str; + + List objects=this.getSession().createSQLQuery(hql).list(); + PgConstructionTypeStatisticDto pgConstructTypeStatisticDto=null; + for(int i=0;i getConstructionNum(){ + String sql="select (select p.typename from pg_construction_type p where p.id=t.pgconstructiontype_id) as typename," + + "count(*) as count from pg_construction t group by t.pgconstructiontype_id"; + + List objects=this.getSession().createSQLQuery(sql).list(); + + List pgConstructionTypeNumDtoList=new ArrayList(); + PgConstructionTypeNumStatisticDto pgConstructionTypeNumDto=null; + for(Object[] objects1:objects){ + pgConstructionTypeNumDto=new PgConstructionTypeNumStatisticDto(); + pgConstructionTypeNumDto.setConstructStatus(String.valueOf(objects1[0])); + pgConstructionTypeNumDto.setConstructNum(String.valueOf(objects1[1])); + + pgConstructionTypeNumDtoList.add(pgConstructionTypeNumDto); + } + return pgConstructionTypeNumDtoList; } public List getConstructionToday(){ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index e409a37..192aa1c 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -2,8 +2,8 @@ import com.casic.PgInterface.construction.domain.PgConstruction; import com.casic.PgInterface.construction.domain.PgConstructionType; -import com.casic.PgInterface.construction.dto.PgConstructTjDto; import com.casic.PgInterface.construction.dto.PgConstructionDto; +import com.casic.PgInterface.construction.dto.PgConstructionStiatistic; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.construction.manager.PgConstructionTypeManager; import com.casic.PgInterface.devTable.domain.PgPartition; @@ -263,10 +263,10 @@ Map resultMap = new HashMap(); String msg = ""; - List pgConstructTjDtoList=new ArrayList(); + List pgConstructionStiatisticList=new ArrayList(); try { - pgConstructTjDtoList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType); - if(pgConstructTjDtoList==null) + pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType); + if(pgConstructionStiatisticList==null) msg="施工统计信息获取失败"; else msg="施工统计信息获取成功"; @@ -275,7 +275,7 @@ msg = "施工统计信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgConstructTjDtoList); + resultMap.put("result", pgConstructionStiatisticList); return resultMap; } @@ -288,10 +288,11 @@ public Map getConstructionByType(@FormParam("statisticType") String statisticType) throws Exception{ Map resultMap=new HashMap(); String msg=""; + List pgConstructionStiatisticList=new ArrayList(); - List pgConstructTjDtoList=new ArrayList(); try{ - pgConstructTjDtoList=pgConstructionManager.getStatisticByPartitionOrType(statisticType); + pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType): + pgConstructionManager.getStatisticByPar(statisticType); msg="统计信息获取成功"; } catch(Exception e) @@ -301,7 +302,7 @@ } resultMap.put("msg",msg); - resultMap.put("result",pgConstructTjDtoList); + resultMap.put("result",pgConstructionStiatisticList); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2b77de9..c32b2ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,27 +6,21 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - @@ -46,8 +40,9 @@ - + + @@ -58,34 +53,35 @@ - + - + - - + + - - + + + - + @@ -96,11 +92,66 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,12 +172,15 @@ getPersonNumInPgByMonth getConstructionToday constructionType - getConstructionNum getPipeGallerys getInPgNum getTodayInPgInfo getInPgPerson getAlarmInfo + PgConstructTjDto + getConstructionNum + getConstructionByType + getConstructionByTimeAndStatus @@ -146,7 +200,6 @@ @@ -243,10 +311,10 @@ - @@ -351,7 +440,7 @@ - + @@ -789,14 +878,8 @@ - - - - 1514511858811 - 1517193532907 @@ -1134,11 +1217,18 @@ - - @@ -1151,13 +1241,14 @@ + - + - + @@ -1193,19 +1284,19 @@ - + - + - + @@ -1214,9 +1305,9 @@ - + - + @@ -1249,7 +1340,6 @@ - @@ -1274,7 +1364,8 @@ - @@ -1293,77 +1384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1413,27 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1459,11 +1458,6 @@ - - - - - @@ -1492,12 +1486,6 @@ - - - - - - @@ -1505,9 +1493,6 @@ - - - @@ -1515,13 +1500,6 @@ - - - - - - - @@ -1548,10 +1526,6 @@ - - - - @@ -1573,12 +1547,6 @@ - - - - - - @@ -1612,16 +1580,6 @@ - - - - - - - - - - @@ -1681,12 +1639,6 @@ - - - - - - @@ -1709,9 +1661,6 @@ - - - @@ -1722,10 +1671,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java deleted file mode 100644 index 0844d9b..0000000 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.PgInterface.construction.dto; - -import java.io.Serializable; - -/** - * Created by Administrator on 2018/3/30. - */ -public class PgConstructTjDto implements Serializable { - - private String constructNum;//施工数量 - private String constructionTime;//时间 - private String constructType;//施工类型 - private String constructStatus;//施工状态 - private String constructPartition;//施工区域 - - public String getConstructNum(){ return constructNum; } - - public void setConstructNum(String constructNum){ this.constructNum = constructNum;} - - public String getConstructionTime() { - return constructionTime; - } - - public void setConstructionTime(String constructionTime) { - this.constructionTime = constructionTime; - } - - public String getConstructType() { - return constructType; - } - - public void setConstructType(String constructType) { - this.constructType = constructType; - } - - public String getConstructStatus() { - return constructStatus; - } - - public void setConstructStatus(String constructStatus) { - this.constructStatus = constructStatus; - } - - public String getConstructPartition() { - return constructPartition; - } - - public void setConstructPartition(String constructPartition) { - this.constructPartition = constructPartition; - } -} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java new file mode 100644 index 0000000..02e9667 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionDateStatistic extends PgConstructionStiatistic{ + + private String constructionTime;//时间 + + public String getConstructionTime() { + return constructionTime; + } + + public void setConstructionTime(String constructionTime) { + this.constructionTime = constructionTime; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java index e1962cc..2e23fca 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java @@ -2,12 +2,11 @@ import com.casic.PgInterface.construction.domain.PgConstruction; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/23. */ -public class PgConstructionDto implements Serializable{ +public class PgConstructionDto{ private String id; private String cs_name;//项目名称 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java new file mode 100644 index 0000000..0e0bfa0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionParStatisticDto extends PgConstructionStiatistic{ + + private String constructPartition;//施工区域 + + public String getConstructPartition() { + return constructPartition; + } + + public void setConstructPartition(String constructPartition) { + this.constructPartition = constructPartition; + } + +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java new file mode 100644 index 0000000..a8e8749 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionStiatistic { + + private String constructNum; + + public String getConstructNum() { + return constructNum; + } + + public void setConstructNum(String constructNum) { + this.constructNum = constructNum; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java index 109c774..b7d79bb 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.construction.domain.PgConstructionType; -import java.io.Serializable; - /** * Created by yxw on 2018/4/10. */ -public class PgConstructionTypeDto implements Serializable { +public class PgConstructionTypeDto{ private String id; private String typeName;//项目状态 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java new file mode 100644 index 0000000..3b5944a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionTypeNumStatisticDto extends PgConstructionStiatistic{ + + + private String constructStatus;//施工状态 + + public String getConstructStatus() { + return constructStatus; + } + + public void setConstructStatus(String constructStatus) { + this.constructStatus = constructStatus; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java new file mode 100644 index 0000000..94ca1ff --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java @@ -0,0 +1,17 @@ +package com.casic.PgInterface.construction.dto; + +/** + * Created by Administrator on 2018/3/30. + */ +public class PgConstructionTypeStatisticDto extends PgConstructionStiatistic{ + + private String constructType;//施工类型 + + public String getConstructType() { + return constructType; + } + + public void setConstructType(String constructType) { + this.constructType = constructType; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java index 10a4f4b..c07d5c2 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.construction.domain.PgCsDocument; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/28. */ -public class PgCsDocumentDto implements Serializable{ +public class PgCsDocumentDto{ private String id; private String list_name;//表单名称 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 46b841f..ac20708 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -1,9 +1,7 @@ package com.casic.PgInterface.construction.manager; import com.casic.PgInterface.construction.domain.PgConstruction; -import com.casic.PgInterface.construction.domain.PgConstructionType; -import com.casic.PgInterface.construction.dto.PgConstructTjDto; -import com.casic.PgInterface.construction.dto.PgConstructionDto; +import com.casic.PgInterface.construction.dto.*; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; @@ -25,20 +23,12 @@ @Service public class PgConstructionManager extends HibernateEntityDao { + @Resource private PgPartitionManager pgPartitionManager; + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - public PgConstruction getPgContructionByName(String name) { Criteria criteria = createCriteria(PgConstruction.class); criteria.add(Restrictions.eq("cs_name", name)); @@ -98,12 +88,12 @@ } //yyyy-mm-dd - public List getConstructionByTimeAndStatus(String startTime, String endTime, String statisticType) { + public List getConstructionByTimeAndStatus(String startTime, String endTime, String statisticType) { String sql = ""; String dateType = ""; - List pgConstructTjDtoList = new ArrayList(); + List pgConstructionStiatisticList = new ArrayList(); int type = Integer.valueOf(statisticType); switch (type) { @@ -122,10 +112,7 @@ default: break; } - sql = "select count(*), to_char(t.CS_BEGINTIME, '" + dateType + "') from PG_CONSTRUCTION t where 1=1 "; - /*"t.CS_BEGINTIME >= " + - "to_date('" + startTime + "', 'yyyy-mm-dd') and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd') " + - "and t.CS_STATUS = '" + constructionStatus + "' group by to_char(t.CS_BEGINTIME, '" + dateType + "')";*/ + 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')"; @@ -137,58 +124,81 @@ List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgConstructTjDto pgConstructTjDto = new PgConstructTjDto(); - pgConstructTjDto.setConstructNum(objects.get(i)[0].toString()); - pgConstructTjDto.setConstructionTime(objects.get(i)[1].toString()); -// pgConstructTjDto.setConstructStatus(constructionStatus); + PgConstructionDateStatistic pgConstructionDateStatistic = new PgConstructionDateStatistic(); - pgConstructTjDtoList.add(pgConstructTjDto); + pgConstructionDateStatistic.setConstructionTime(objects.get(i)[0].toString()); + pgConstructionDateStatistic.setConstructNum(objects.get(i)[1].toString()); + + pgConstructionStiatisticList.add(pgConstructionDateStatistic); } - return pgConstructTjDtoList; + return pgConstructionStiatisticList; } - public List getStatisticByPartitionOrType(String statisticType) { - List pgConstructTjDtoList = new ArrayList(); - String str=statisticType.equals("0")?"CS_TYPE":"PAPARTITION_ID"; - try { + public List getStatisticByPar(String statisticType){ + List pgConstructionStiatisticList = new ArrayList(); + String str="PAPARTITION_ID"; - String hql="select count(*), pgConstruction." + str + " from Pg_Construction pgConstruction "+ + try { + String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ "where active = 1 group by pgConstruction." + str; List objects=this.getSession().createSQLQuery(hql).list(); + PgConstructionParStatisticDto pgConstructionParStatisticDto=null; for(int i=0;i getStatisticByType(String statisticType) { + List pgConstructionStiatisticList = new ArrayList(); - Criteria criteria = createCriteria(PgConstruction.class); - //criteria.add(Restrictions.eq("active", 1)); - if(pgConstructionType!=null) - criteria.add(Restrictions.eq("pgConstructionTypeId",pgConstructionType)); + String str="CS_TYPE"; - List pgConstructionList=criteria.list(); - if(pgConstructionList==null) - return 0; - else - return pgConstructionList.size(); + try { + String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ + "where active = 1 group by pgConstruction." + str; + + List objects=this.getSession().createSQLQuery(hql).list(); + PgConstructionTypeStatisticDto pgConstructTypeStatisticDto=null; + for(int i=0;i getConstructionNum(){ + String sql="select (select p.typename from pg_construction_type p where p.id=t.pgconstructiontype_id) as typename," + + "count(*) as count from pg_construction t group by t.pgconstructiontype_id"; + + List objects=this.getSession().createSQLQuery(sql).list(); + + List pgConstructionTypeNumDtoList=new ArrayList(); + PgConstructionTypeNumStatisticDto pgConstructionTypeNumDto=null; + for(Object[] objects1:objects){ + pgConstructionTypeNumDto=new PgConstructionTypeNumStatisticDto(); + pgConstructionTypeNumDto.setConstructStatus(String.valueOf(objects1[0])); + pgConstructionTypeNumDto.setConstructNum(String.valueOf(objects1[1])); + + pgConstructionTypeNumDtoList.add(pgConstructionTypeNumDto); + } + return pgConstructionTypeNumDtoList; } public List getConstructionToday(){ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index e409a37..192aa1c 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -2,8 +2,8 @@ import com.casic.PgInterface.construction.domain.PgConstruction; import com.casic.PgInterface.construction.domain.PgConstructionType; -import com.casic.PgInterface.construction.dto.PgConstructTjDto; import com.casic.PgInterface.construction.dto.PgConstructionDto; +import com.casic.PgInterface.construction.dto.PgConstructionStiatistic; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.construction.manager.PgConstructionTypeManager; import com.casic.PgInterface.devTable.domain.PgPartition; @@ -263,10 +263,10 @@ Map resultMap = new HashMap(); String msg = ""; - List pgConstructTjDtoList=new ArrayList(); + List pgConstructionStiatisticList=new ArrayList(); try { - pgConstructTjDtoList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType); - if(pgConstructTjDtoList==null) + pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType); + if(pgConstructionStiatisticList==null) msg="施工统计信息获取失败"; else msg="施工统计信息获取成功"; @@ -275,7 +275,7 @@ msg = "施工统计信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgConstructTjDtoList); + resultMap.put("result", pgConstructionStiatisticList); return resultMap; } @@ -288,10 +288,11 @@ public Map getConstructionByType(@FormParam("statisticType") String statisticType) throws Exception{ Map resultMap=new HashMap(); String msg=""; + List pgConstructionStiatisticList=new ArrayList(); - List pgConstructTjDtoList=new ArrayList(); try{ - pgConstructTjDtoList=pgConstructionManager.getStatisticByPartitionOrType(statisticType); + pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType): + pgConstructionManager.getStatisticByPar(statisticType); msg="统计信息获取成功"; } catch(Exception e) @@ -301,7 +302,7 @@ } resultMap.put("msg",msg); - resultMap.put("result",pgConstructTjDtoList); + resultMap.put("result",pgConstructionStiatisticList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java index dfcb131..ffd84aa 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.construction.dto.PgConstructionDto; +import com.casic.PgInterface.construction.dto.PgConstructionTypeNumStatisticDto; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; @@ -28,34 +29,15 @@ @Path("pgOverViewRs") public class PgOverViewRs { + @Resource private PgInPgPersonManager pgInPgPersonManager; - + @Resource private PgInPgStatusManager pgInPgStatusManager; - + @Resource private PgAlarmManager pgAlarmManager; - + @Resource private PgConstructionManager pgConstructionManager; - @Resource - public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { - this.pgInPgPersonManager = pgInPgPersonManager; - } - - @Resource - public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { - this.pgInPgStatusManager = pgInPgStatusManager; - } - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) { - this.pgConstructionManager = pgConstructionManager; - } - //入廊人员 /** * 获取本月入廊人员次数 @@ -290,12 +272,12 @@ @POST @Path("getConstructionNum") @Produces(MediaType.APPLICATION_JSON) - public Map getConstructionNum(@FormParam("constructionType") String constructionType) throws Exception{ - Map resultMap = new HashMap(); + public Map getConstructionNum() throws Exception{ + Map resultMap = new HashMap(); String msg = ""; - int constructNum=0; + List pgConstructionTypeNumDtoList=new ArrayList(); try{ - constructNum=pgConstructionManager.getConstructionNum(constructionType); + pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum(); msg="施工数量获取成功"; } catch(Exception e) @@ -305,7 +287,7 @@ } resultMap.put("msg",msg); - resultMap.put("result",String.valueOf(constructNum)); + resultMap.put("result",pgConstructionTypeNumDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java b/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java new file mode 100644 index 0000000..6639962 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.test; + +public class httpInterfaceTest { + + public static void main(String[] args){ +/* URL url=new URL(www.uradiosys.com:8094/Help/Api/POST-api-HostInfo-HostAddOrUpdateByOtherSys); + try{ + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + } + catch(IOException e){ + e.printStackTrace(); + }*/ + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2b77de9..c32b2ee 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,27 +6,21 @@ - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + - @@ -46,8 +40,9 @@ - + + @@ -58,34 +53,35 @@ - + - + - - + + - - + + + - + @@ -96,11 +92,66 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -121,12 +172,15 @@ getPersonNumInPgByMonth getConstructionToday constructionType - getConstructionNum getPipeGallerys getInPgNum getTodayInPgInfo getInPgPerson getAlarmInfo + PgConstructTjDto + getConstructionNum + getConstructionByType + getConstructionByTimeAndStatus @@ -146,7 +200,6 @@ @@ -243,10 +311,10 @@ - @@ -351,7 +440,7 @@ - + @@ -789,14 +878,8 @@ - - - - 1514511858811 - 1517193532907 @@ -1134,11 +1217,18 @@ - - @@ -1151,13 +1241,14 @@ + - + - + @@ -1193,19 +1284,19 @@ - + - + - + @@ -1214,9 +1305,9 @@ - + - + @@ -1249,7 +1340,6 @@ - @@ -1274,7 +1364,8 @@ - @@ -1293,77 +1384,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1413,27 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -1459,11 +1458,6 @@ - - - - - @@ -1492,12 +1486,6 @@ - - - - - - @@ -1505,9 +1493,6 @@ - - - @@ -1515,13 +1500,6 @@ - - - - - - - @@ -1548,10 +1526,6 @@ - - - - @@ -1573,12 +1547,6 @@ - - - - - - @@ -1612,16 +1580,6 @@ - - - - - - - - - - @@ -1681,12 +1639,6 @@ - - - - - - @@ -1709,9 +1661,6 @@ - - - @@ -1722,10 +1671,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java deleted file mode 100644 index 0844d9b..0000000 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructTjDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.casic.PgInterface.construction.dto; - -import java.io.Serializable; - -/** - * Created by Administrator on 2018/3/30. - */ -public class PgConstructTjDto implements Serializable { - - private String constructNum;//施工数量 - private String constructionTime;//时间 - private String constructType;//施工类型 - private String constructStatus;//施工状态 - private String constructPartition;//施工区域 - - public String getConstructNum(){ return constructNum; } - - public void setConstructNum(String constructNum){ this.constructNum = constructNum;} - - public String getConstructionTime() { - return constructionTime; - } - - public void setConstructionTime(String constructionTime) { - this.constructionTime = constructionTime; - } - - public String getConstructType() { - return constructType; - } - - public void setConstructType(String constructType) { - this.constructType = constructType; - } - - public String getConstructStatus() { - return constructStatus; - } - - public void setConstructStatus(String constructStatus) { - this.constructStatus = constructStatus; - } - - public String getConstructPartition() { - return constructPartition; - } - - public void setConstructPartition(String constructPartition) { - this.constructPartition = constructPartition; - } -} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java new file mode 100644 index 0000000..02e9667 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDateStatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionDateStatistic extends PgConstructionStiatistic{ + + private String constructionTime;//时间 + + public String getConstructionTime() { + return constructionTime; + } + + public void setConstructionTime(String constructionTime) { + this.constructionTime = constructionTime; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java index e1962cc..2e23fca 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionDto.java @@ -2,12 +2,11 @@ import com.casic.PgInterface.construction.domain.PgConstruction; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/23. */ -public class PgConstructionDto implements Serializable{ +public class PgConstructionDto{ private String id; private String cs_name;//项目名称 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java new file mode 100644 index 0000000..0e0bfa0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionParStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionParStatisticDto extends PgConstructionStiatistic{ + + private String constructPartition;//施工区域 + + public String getConstructPartition() { + return constructPartition; + } + + public void setConstructPartition(String constructPartition) { + this.constructPartition = constructPartition; + } + +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java new file mode 100644 index 0000000..a8e8749 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionStiatistic.java @@ -0,0 +1,14 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionStiatistic { + + private String constructNum; + + public String getConstructNum() { + return constructNum; + } + + public void setConstructNum(String constructNum) { + this.constructNum = constructNum; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java index 109c774..b7d79bb 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeDto.java @@ -2,12 +2,10 @@ import com.casic.PgInterface.construction.domain.PgConstructionType; -import java.io.Serializable; - /** * Created by yxw on 2018/4/10. */ -public class PgConstructionTypeDto implements Serializable { +public class PgConstructionTypeDto{ private String id; private String typeName;//项目状态 diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java new file mode 100644 index 0000000..3b5944a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeNumStatisticDto.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.construction.dto; + +public class PgConstructionTypeNumStatisticDto extends PgConstructionStiatistic{ + + + private String constructStatus;//施工状态 + + public String getConstructStatus() { + return constructStatus; + } + + public void setConstructStatus(String constructStatus) { + this.constructStatus = constructStatus; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java new file mode 100644 index 0000000..94ca1ff --- /dev/null +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgConstructionTypeStatisticDto.java @@ -0,0 +1,17 @@ +package com.casic.PgInterface.construction.dto; + +/** + * Created by Administrator on 2018/3/30. + */ +public class PgConstructionTypeStatisticDto extends PgConstructionStiatistic{ + + private String constructType;//施工类型 + + public String getConstructType() { + return constructType; + } + + public void setConstructType(String constructType) { + this.constructType = constructType; + } +} diff --git a/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java b/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java index 10a4f4b..c07d5c2 100644 --- a/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java +++ b/src/main/java/com/casic/PgInterface/construction/dto/PgCsDocumentDto.java @@ -2,13 +2,12 @@ import com.casic.PgInterface.construction.domain.PgCsDocument; -import java.io.Serializable; import java.text.SimpleDateFormat; /** * Created by zxh on 2018/3/28. */ -public class PgCsDocumentDto implements Serializable{ +public class PgCsDocumentDto{ private String id; private String list_name;//表单名称 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 46b841f..ac20708 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -1,9 +1,7 @@ package com.casic.PgInterface.construction.manager; import com.casic.PgInterface.construction.domain.PgConstruction; -import com.casic.PgInterface.construction.domain.PgConstructionType; -import com.casic.PgInterface.construction.dto.PgConstructTjDto; -import com.casic.PgInterface.construction.dto.PgConstructionDto; +import com.casic.PgInterface.construction.dto.*; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.StringUtils; @@ -25,20 +23,12 @@ @Service public class PgConstructionManager extends HibernateEntityDao { + @Resource private PgPartitionManager pgPartitionManager; + @Resource private PgConstructionTypeManager pgConstructionTypeManager; - @Resource - public void setPgPartitionManager(PgPartitionManager pgPartitionManager) { - this.pgPartitionManager = pgPartitionManager; - } - - @Resource - public void setPgConstructionTypeManager(PgConstructionTypeManager pgConstructionTypeManager) { - this.pgConstructionTypeManager = pgConstructionTypeManager; - } - public PgConstruction getPgContructionByName(String name) { Criteria criteria = createCriteria(PgConstruction.class); criteria.add(Restrictions.eq("cs_name", name)); @@ -98,12 +88,12 @@ } //yyyy-mm-dd - public List getConstructionByTimeAndStatus(String startTime, String endTime, String statisticType) { + public List getConstructionByTimeAndStatus(String startTime, String endTime, String statisticType) { String sql = ""; String dateType = ""; - List pgConstructTjDtoList = new ArrayList(); + List pgConstructionStiatisticList = new ArrayList(); int type = Integer.valueOf(statisticType); switch (type) { @@ -122,10 +112,7 @@ default: break; } - sql = "select count(*), to_char(t.CS_BEGINTIME, '" + dateType + "') from PG_CONSTRUCTION t where 1=1 "; - /*"t.CS_BEGINTIME >= " + - "to_date('" + startTime + "', 'yyyy-mm-dd') and t.CS_BEGINTIME <= to_date('" + endTime + "', 'yyyy-mm-dd') " + - "and t.CS_STATUS = '" + constructionStatus + "' group by to_char(t.CS_BEGINTIME, '" + dateType + "')";*/ + 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')"; @@ -137,58 +124,81 @@ List objects = this.getSession().createSQLQuery(sql).list(); for (int i = 0; i < objects.size(); i++) { - PgConstructTjDto pgConstructTjDto = new PgConstructTjDto(); - pgConstructTjDto.setConstructNum(objects.get(i)[0].toString()); - pgConstructTjDto.setConstructionTime(objects.get(i)[1].toString()); -// pgConstructTjDto.setConstructStatus(constructionStatus); + PgConstructionDateStatistic pgConstructionDateStatistic = new PgConstructionDateStatistic(); - pgConstructTjDtoList.add(pgConstructTjDto); + pgConstructionDateStatistic.setConstructionTime(objects.get(i)[0].toString()); + pgConstructionDateStatistic.setConstructNum(objects.get(i)[1].toString()); + + pgConstructionStiatisticList.add(pgConstructionDateStatistic); } - return pgConstructTjDtoList; + return pgConstructionStiatisticList; } - public List getStatisticByPartitionOrType(String statisticType) { - List pgConstructTjDtoList = new ArrayList(); - String str=statisticType.equals("0")?"CS_TYPE":"PAPARTITION_ID"; - try { + public List getStatisticByPar(String statisticType){ + List pgConstructionStiatisticList = new ArrayList(); + String str="PAPARTITION_ID"; - String hql="select count(*), pgConstruction." + str + " from Pg_Construction pgConstruction "+ + try { + String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ "where active = 1 group by pgConstruction." + str; List objects=this.getSession().createSQLQuery(hql).list(); + PgConstructionParStatisticDto pgConstructionParStatisticDto=null; for(int i=0;i getStatisticByType(String statisticType) { + List pgConstructionStiatisticList = new ArrayList(); - Criteria criteria = createCriteria(PgConstruction.class); - //criteria.add(Restrictions.eq("active", 1)); - if(pgConstructionType!=null) - criteria.add(Restrictions.eq("pgConstructionTypeId",pgConstructionType)); + String str="CS_TYPE"; - List pgConstructionList=criteria.list(); - if(pgConstructionList==null) - return 0; - else - return pgConstructionList.size(); + try { + String hql="select pgConstruction." + str + ", count(*) from Pg_Construction pgConstruction "+ + "where active = 1 group by pgConstruction." + str; + + List objects=this.getSession().createSQLQuery(hql).list(); + PgConstructionTypeStatisticDto pgConstructTypeStatisticDto=null; + for(int i=0;i getConstructionNum(){ + String sql="select (select p.typename from pg_construction_type p where p.id=t.pgconstructiontype_id) as typename," + + "count(*) as count from pg_construction t group by t.pgconstructiontype_id"; + + List objects=this.getSession().createSQLQuery(sql).list(); + + List pgConstructionTypeNumDtoList=new ArrayList(); + PgConstructionTypeNumStatisticDto pgConstructionTypeNumDto=null; + for(Object[] objects1:objects){ + pgConstructionTypeNumDto=new PgConstructionTypeNumStatisticDto(); + pgConstructionTypeNumDto.setConstructStatus(String.valueOf(objects1[0])); + pgConstructionTypeNumDto.setConstructNum(String.valueOf(objects1[1])); + + pgConstructionTypeNumDtoList.add(pgConstructionTypeNumDto); + } + return pgConstructionTypeNumDtoList; } public List getConstructionToday(){ diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java index e409a37..192aa1c 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java @@ -2,8 +2,8 @@ import com.casic.PgInterface.construction.domain.PgConstruction; import com.casic.PgInterface.construction.domain.PgConstructionType; -import com.casic.PgInterface.construction.dto.PgConstructTjDto; import com.casic.PgInterface.construction.dto.PgConstructionDto; +import com.casic.PgInterface.construction.dto.PgConstructionStiatistic; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.construction.manager.PgConstructionTypeManager; import com.casic.PgInterface.devTable.domain.PgPartition; @@ -263,10 +263,10 @@ Map resultMap = new HashMap(); String msg = ""; - List pgConstructTjDtoList=new ArrayList(); + List pgConstructionStiatisticList=new ArrayList(); try { - pgConstructTjDtoList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType); - if(pgConstructTjDtoList==null) + pgConstructionStiatisticList = pgConstructionManager.getConstructionByTimeAndStatus(startTime, endTime, statisticType); + if(pgConstructionStiatisticList==null) msg="施工统计信息获取失败"; else msg="施工统计信息获取成功"; @@ -275,7 +275,7 @@ msg = "施工统计信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgConstructTjDtoList); + resultMap.put("result", pgConstructionStiatisticList); return resultMap; } @@ -288,10 +288,11 @@ public Map getConstructionByType(@FormParam("statisticType") String statisticType) throws Exception{ Map resultMap=new HashMap(); String msg=""; + List pgConstructionStiatisticList=new ArrayList(); - List pgConstructTjDtoList=new ArrayList(); try{ - pgConstructTjDtoList=pgConstructionManager.getStatisticByPartitionOrType(statisticType); + pgConstructionStiatisticList=statisticType.equals("0")?pgConstructionManager.getStatisticByType(statisticType): + pgConstructionManager.getStatisticByPar(statisticType); msg="统计信息获取成功"; } catch(Exception e) @@ -301,7 +302,7 @@ } resultMap.put("msg",msg); - resultMap.put("result",pgConstructTjDtoList); + resultMap.put("result",pgConstructionStiatisticList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java index dfcb131..ffd84aa 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgOverViewRs.java @@ -1,6 +1,7 @@ package com.casic.PgInterface.rs; import com.casic.PgInterface.construction.dto.PgConstructionDto; +import com.casic.PgInterface.construction.dto.PgConstructionTypeNumStatisticDto; import com.casic.PgInterface.construction.manager.PgConstructionManager; import com.casic.PgInterface.devTable.dto.PgAlarmDto; import com.casic.PgInterface.devTable.dto.PgAlarmTjDto; @@ -28,34 +29,15 @@ @Path("pgOverViewRs") public class PgOverViewRs { + @Resource private PgInPgPersonManager pgInPgPersonManager; - + @Resource private PgInPgStatusManager pgInPgStatusManager; - + @Resource private PgAlarmManager pgAlarmManager; - + @Resource private PgConstructionManager pgConstructionManager; - @Resource - public void setPgInPgPersonManager(PgInPgPersonManager pgInPgPersonManager) { - this.pgInPgPersonManager = pgInPgPersonManager; - } - - @Resource - public void setPgInPgStatusManager(PgInPgStatusManager pgInPgStatusManager) { - this.pgInPgStatusManager = pgInPgStatusManager; - } - - @Resource - public void setPgAlarmManager(PgAlarmManager pgAlarmManager) { - this.pgAlarmManager = pgAlarmManager; - } - - @Resource - public void setPgConstructionManager(PgConstructionManager pgConstructionManager) { - this.pgConstructionManager = pgConstructionManager; - } - //入廊人员 /** * 获取本月入廊人员次数 @@ -290,12 +272,12 @@ @POST @Path("getConstructionNum") @Produces(MediaType.APPLICATION_JSON) - public Map getConstructionNum(@FormParam("constructionType") String constructionType) throws Exception{ - Map resultMap = new HashMap(); + public Map getConstructionNum() throws Exception{ + Map resultMap = new HashMap(); String msg = ""; - int constructNum=0; + List pgConstructionTypeNumDtoList=new ArrayList(); try{ - constructNum=pgConstructionManager.getConstructionNum(constructionType); + pgConstructionTypeNumDtoList=pgConstructionManager.getConstructionNum(); msg="施工数量获取成功"; } catch(Exception e) @@ -305,7 +287,7 @@ } resultMap.put("msg",msg); - resultMap.put("result",String.valueOf(constructNum)); + resultMap.put("result",pgConstructionTypeNumDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java b/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java new file mode 100644 index 0000000..6639962 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/test/httpInterfaceTest.java @@ -0,0 +1,15 @@ +package com.casic.PgInterface.test; + +public class httpInterfaceTest { + + public static void main(String[] args){ +/* URL url=new URL(www.uradiosys.com:8094/Help/Api/POST-api-HostInfo-HostAddOrUpdateByOtherSys); + try{ + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + } + catch(IOException e){ + e.printStackTrace(); + }*/ + } + +} diff --git a/~WRL0009.tmp b/~WRL0009.tmp new file mode 100644 index 0000000..e3653c8 --- /dev/null +++ b/~WRL0009.tmp Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" index 78fc55c..5be635e 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" Binary files differ