diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getMaintainByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_MAINTAIN t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getMaintainByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_MAINTAIN t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getPatrolByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_PATROL t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getMaintainByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_MAINTAIN t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getPatrolByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_PATROL t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception - { + public Map constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception { Map resultMap = new HashMap(); List pgConstructTjDtoList = new ArrayList(); String msg = ""; try { pgConstructTjDtoList = pgConstructionManager.getAllConstructByDay(cs_beginTime); - if (pgConstructTjDtoList != null) - { + if (pgConstructTjDtoList != null) { msg = "获取成功"; - }else{ + } else { msg = "没有符合条件的数据"; } - }catch(Exception e) - { + } catch (Exception e) { e.printStackTrace(); msg = "获取失败"; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getMaintainByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_MAINTAIN t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getPatrolByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_PATROL t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception - { + public Map constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception { Map resultMap = new HashMap(); List pgConstructTjDtoList = new ArrayList(); String msg = ""; try { pgConstructTjDtoList = pgConstructionManager.getAllConstructByDay(cs_beginTime); - if (pgConstructTjDtoList != null) - { + if (pgConstructTjDtoList != null) { msg = "获取成功"; - }else{ + } else { msg = "没有符合条件的数据"; } - }catch(Exception e) - { + } catch (Exception e) { e.printStackTrace(); msg = "获取失败"; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index f67760b..d1762a3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -202,33 +202,59 @@ return resultMap; } + /** + * 累计入廊人次 + */ + @POST + @Path("getInPgNum") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgNum() throws Exception { + Map resultMap = new HashMap(); + int inPgNum=0; + String msg = ""; + + try{ + inPgNum=pgInPgStatusManager.getInPgNum(); + + msg="入廊次数获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="入廊次数获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",inPgNum); + + return resultMap; + } /** * 根据时间统计入廊人员次数 */ - /* @POST @Path("getInPgPersonByTime") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByTime(@FormParam("year") String year, + public Map getInPgPersonByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, @FormParam("statisticType") String statisticType) throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgInPgPersonDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList(); try { - pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); - if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) - msg = "没有找到入廊人员信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType); + if(pgInPgInfoDtoList==null) + msg="入廊人员统计信息获取失败"; else - msg = "入廊人员统计信息获取成功"; + msg="入廊人员统计信息获取成功"; } catch (Exception e) { e.printStackTrace(); msg = "入廊人员统计信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgInPgPersonDtoList); + resultMap.put("result", pgInPgInfoDtoList); return resultMap; } - */ -} + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getMaintainByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_MAINTAIN t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getPatrolByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_PATROL t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception - { + public Map constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception { Map resultMap = new HashMap(); List pgConstructTjDtoList = new ArrayList(); String msg = ""; try { pgConstructTjDtoList = pgConstructionManager.getAllConstructByDay(cs_beginTime); - if (pgConstructTjDtoList != null) - { + if (pgConstructTjDtoList != null) { msg = "获取成功"; - }else{ + } else { msg = "没有符合条件的数据"; } - }catch(Exception e) - { + } catch (Exception e) { e.printStackTrace(); msg = "获取失败"; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index f67760b..d1762a3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -202,33 +202,59 @@ return resultMap; } + /** + * 累计入廊人次 + */ + @POST + @Path("getInPgNum") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgNum() throws Exception { + Map resultMap = new HashMap(); + int inPgNum=0; + String msg = ""; + + try{ + inPgNum=pgInPgStatusManager.getInPgNum(); + + msg="入廊次数获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="入廊次数获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",inPgNum); + + return resultMap; + } /** * 根据时间统计入廊人员次数 */ - /* @POST @Path("getInPgPersonByTime") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByTime(@FormParam("year") String year, + public Map getInPgPersonByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, @FormParam("statisticType") String statisticType) throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgInPgPersonDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList(); try { - pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); - if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) - msg = "没有找到入廊人员信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType); + if(pgInPgInfoDtoList==null) + msg="入廊人员统计信息获取失败"; else - msg = "入廊人员统计信息获取成功"; + msg="入廊人员统计信息获取成功"; } catch (Exception e) { e.printStackTrace(); msg = "入廊人员统计信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgInPgPersonDtoList); + resultMap.put("result", pgInPgInfoDtoList); return resultMap; } - */ -} + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java index a310aeb..2639058 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.patroler.domain.PgMaintain; import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.dto.PgPatrolMaintainInfoDto; import com.casic.PgInterface.patroler.manager.PgMaintainManager; import org.springframework.stereotype.Component; @@ -170,6 +171,32 @@ return resultMap; } + /** + * 根据时间统计巡检次数 + */ + @POST + @Path("getMaintainByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintainByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgPatrolMaintainInfoDtoList = new ArrayList(); + try { + pgPatrolMaintainInfoDtoList = pgMaintainManager.getMaintainByTime(startTime, endTime, statisticType); + if(pgPatrolMaintainInfoDtoList==null) + msg="维护统计信息获取失败"; + else + msg="维护统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgPatrolMaintainInfoDtoList); + return resultMap; + } } \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getMaintainByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_MAINTAIN t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getPatrolByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_PATROL t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception - { + public Map constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception { Map resultMap = new HashMap(); List pgConstructTjDtoList = new ArrayList(); String msg = ""; try { pgConstructTjDtoList = pgConstructionManager.getAllConstructByDay(cs_beginTime); - if (pgConstructTjDtoList != null) - { + if (pgConstructTjDtoList != null) { msg = "获取成功"; - }else{ + } else { msg = "没有符合条件的数据"; } - }catch(Exception e) - { + } catch (Exception e) { e.printStackTrace(); msg = "获取失败"; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index f67760b..d1762a3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -202,33 +202,59 @@ return resultMap; } + /** + * 累计入廊人次 + */ + @POST + @Path("getInPgNum") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgNum() throws Exception { + Map resultMap = new HashMap(); + int inPgNum=0; + String msg = ""; + + try{ + inPgNum=pgInPgStatusManager.getInPgNum(); + + msg="入廊次数获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="入廊次数获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",inPgNum); + + return resultMap; + } /** * 根据时间统计入廊人员次数 */ - /* @POST @Path("getInPgPersonByTime") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByTime(@FormParam("year") String year, + public Map getInPgPersonByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, @FormParam("statisticType") String statisticType) throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgInPgPersonDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList(); try { - pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); - if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) - msg = "没有找到入廊人员信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType); + if(pgInPgInfoDtoList==null) + msg="入廊人员统计信息获取失败"; else - msg = "入廊人员统计信息获取成功"; + msg="入廊人员统计信息获取成功"; } catch (Exception e) { e.printStackTrace(); msg = "入廊人员统计信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgInPgPersonDtoList); + resultMap.put("result", pgInPgInfoDtoList); return resultMap; } - */ -} + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java index a310aeb..2639058 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.patroler.domain.PgMaintain; import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.dto.PgPatrolMaintainInfoDto; import com.casic.PgInterface.patroler.manager.PgMaintainManager; import org.springframework.stereotype.Component; @@ -170,6 +171,32 @@ return resultMap; } + /** + * 根据时间统计巡检次数 + */ + @POST + @Path("getMaintainByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintainByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgPatrolMaintainInfoDtoList = new ArrayList(); + try { + pgPatrolMaintainInfoDtoList = pgMaintainManager.getMaintainByTime(startTime, endTime, statisticType); + if(pgPatrolMaintainInfoDtoList==null) + msg="维护统计信息获取失败"; + else + msg="维护统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgPatrolMaintainInfoDtoList); + return resultMap; + } } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java index 130b873..8ac807a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.patroler.domain.PgPatrol; import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.dto.PgPatrolMaintainInfoDto; import com.casic.PgInterface.patroler.manager.PgPatrolManager; import org.springframework.stereotype.Component; @@ -170,6 +171,33 @@ return resultMap; } + /** + * 根据时间统计巡检次数 + */ + @POST + @Path("getPatrolByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgPatrolMaintainInfoDtoList = new ArrayList(); + try { + pgPatrolMaintainInfoDtoList = pgPatrolManager.getPatrolByTime(startTime, endTime, statisticType); + if(pgPatrolMaintainInfoDtoList==null) + msg="巡检统计信息获取失败"; + else + msg="巡检统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgPatrolMaintainInfoDtoList); + return resultMap; + } } \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getMaintainByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_MAINTAIN t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getPatrolByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_PATROL t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception - { + public Map constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception { Map resultMap = new HashMap(); List pgConstructTjDtoList = new ArrayList(); String msg = ""; try { pgConstructTjDtoList = pgConstructionManager.getAllConstructByDay(cs_beginTime); - if (pgConstructTjDtoList != null) - { + if (pgConstructTjDtoList != null) { msg = "获取成功"; - }else{ + } else { msg = "没有符合条件的数据"; } - }catch(Exception e) - { + } catch (Exception e) { e.printStackTrace(); msg = "获取失败"; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index f67760b..d1762a3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -202,33 +202,59 @@ return resultMap; } + /** + * 累计入廊人次 + */ + @POST + @Path("getInPgNum") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgNum() throws Exception { + Map resultMap = new HashMap(); + int inPgNum=0; + String msg = ""; + + try{ + inPgNum=pgInPgStatusManager.getInPgNum(); + + msg="入廊次数获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="入廊次数获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",inPgNum); + + return resultMap; + } /** * 根据时间统计入廊人员次数 */ - /* @POST @Path("getInPgPersonByTime") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByTime(@FormParam("year") String year, + public Map getInPgPersonByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, @FormParam("statisticType") String statisticType) throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgInPgPersonDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList(); try { - pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); - if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) - msg = "没有找到入廊人员信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType); + if(pgInPgInfoDtoList==null) + msg="入廊人员统计信息获取失败"; else - msg = "入廊人员统计信息获取成功"; + msg="入廊人员统计信息获取成功"; } catch (Exception e) { e.printStackTrace(); msg = "入廊人员统计信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgInPgPersonDtoList); + resultMap.put("result", pgInPgInfoDtoList); return resultMap; } - */ -} + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java index a310aeb..2639058 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.patroler.domain.PgMaintain; import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.dto.PgPatrolMaintainInfoDto; import com.casic.PgInterface.patroler.manager.PgMaintainManager; import org.springframework.stereotype.Component; @@ -170,6 +171,32 @@ return resultMap; } + /** + * 根据时间统计巡检次数 + */ + @POST + @Path("getMaintainByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintainByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgPatrolMaintainInfoDtoList = new ArrayList(); + try { + pgPatrolMaintainInfoDtoList = pgMaintainManager.getMaintainByTime(startTime, endTime, statisticType); + if(pgPatrolMaintainInfoDtoList==null) + msg="维护统计信息获取失败"; + else + msg="维护统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgPatrolMaintainInfoDtoList); + return resultMap; + } } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java index 130b873..8ac807a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.patroler.domain.PgPatrol; import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.dto.PgPatrolMaintainInfoDto; import com.casic.PgInterface.patroler.manager.PgPatrolManager; import org.springframework.stereotype.Component; @@ -170,6 +171,33 @@ return resultMap; } + /** + * 根据时间统计巡检次数 + */ + @POST + @Path("getPatrolByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgPatrolMaintainInfoDtoList = new ArrayList(); + try { + pgPatrolMaintainInfoDtoList = pgPatrolManager.getPatrolByTime(startTime, endTime, statisticType); + if(pgPatrolMaintainInfoDtoList==null) + msg="巡检统计信息获取失败"; + else + msg="巡检统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgPatrolMaintainInfoDtoList); + return resultMap; + } } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5f21060..aa56bd8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,7 +16,7 @@ # db # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver -db.default.url=jdbc:oracle:thin:@192.168.0.122:1521:szgh +db.default.url=jdbc:oracle:thin:@127.0.0.1:1521:szgh db.default.username=PG db.default.password=PG diff --git a/.idea/workspace.xml b/.idea/workspace.xml index be2235d..e1d2198 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,28 +2,20 @@ - - - - - - - - - - - - - - - - + + + + + + + - - - + + + + + - @@ -48,36 +40,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -95,13 +58,6 @@ @@ -206,9 +169,9 @@ - @@ -239,7 +202,6 @@ - @@ -431,6 +393,44 @@ + + + + + + + + + + + + + + + + + @@ -461,10 +461,6 @@ - - @@ -534,38 +530,9 @@ - - - - - - - - - - - - - - - - + @@ -987,7 +954,9 @@ - + + + 1510219102698 @@ -1081,11 +1050,15 @@ 1522720789330 1522720789330 - - @@ -1108,7 +1081,7 @@ - + @@ -1120,8 +1093,8 @@ - - + + @@ -1133,7 +1106,7 @@ - + @@ -1196,7 +1169,7 @@ @@ -1204,84 +1177,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1310,20 +1205,6 @@ - - - - - - - - - - - - - - @@ -1331,20 +1212,6 @@ - - - - - - - - - - - - - - @@ -1380,13 +1247,6 @@ - - - - - - - @@ -1405,13 +1265,6 @@ - - - - - - - @@ -1433,13 +1286,6 @@ - - - - - - - @@ -1447,54 +1293,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1507,38 +1305,16 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + @@ -1546,7 +1322,6 @@ - @@ -1554,15 +1329,6 @@ - - - - - - - - - @@ -1578,38 +1344,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1fdac02..09468a4 100644 --- a/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java +++ b/src/main/java/com/casic/PgInterface/construction/manager/PgConstructionManager.java @@ -172,7 +172,6 @@ } /*按周统计*/ - public List getBuildingByWeek(String queryDate) throws Exception { List pgConstructionDtoList = new ArrayList(); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index b241650..20d8898 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -14,6 +14,7 @@ private String personType;//人员类别 private String isInPg;//是否在廊内 private String lastInTime;//最后入廊时间 + private String inPgTime;//入廊时间 private String inPgNum;//入廊次数 public String getUserName() { @@ -64,6 +65,14 @@ this.inPgNum = inPgNum; } + public String getInPgTime() { + return inPgTime; + } + + public void setInPgTime(String inPgTime) { + this.inPgTime = inPgTime; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson,PgInPgStatus pgInPgStatus,int inPgNum) { SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 96f6150..69fc7f3 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgPersonDto.java @@ -15,6 +15,8 @@ private String personType;//人员类别 private String isInPg; + private String inPgNum; + public String getId() { return id; } @@ -55,6 +57,14 @@ this.isInPg = isInPg; } + public String getInPgNum() { + return inPgNum; + } + + public void setInPgNum(String inPgNum) { + this.inPgNum = inPgNum; + } + public PgInPgPersonDto(PgInPgPerson pgInPgPerson) { this.setId(String.valueOf(pgInPgPerson.getId())); diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java new file mode 100644 index 0000000..aad511a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgPatrolMaintainInfoDto.java @@ -0,0 +1,26 @@ +package com.casic.PgInterface.patroler.dto; + +/** + * Created by yxw on 2018/4/8. + */ +public class PgPatrolMaintainInfoDto { + + private String date; + private String num; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } +} diff --git a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java index 96efa91..b382346 100644 --- a/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java +++ b/src/main/java/com/casic/PgInterface/patroler/manager/PgInPgPersonManager.java @@ -1,10 +1,10 @@ package com.casic.PgInterface.patroler.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; -import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import org.hibernate.Criteria; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; @@ -48,8 +48,8 @@ Criteria criteria = createCriteria(PgInPgPerson.class); criteria.addOrder(Order.desc("id")); - if(perType==1) - criteria.add(Restrictions.eq("isInPg",1)); + if (perType == 1) + criteria.add(Restrictions.eq("isInPg", 1)); List pgInPgPersonList = criteria.list(); List pgInPgInfoDtoList = new ArrayList(); @@ -64,33 +64,42 @@ return pgInPgInfoDtoList; } - public List getPgInPersonListByTime(String year,String statisticType) { + //yyyy-mm-dd + public List getPgInPersonListByTime(String startTime,String endTime,String statisticType) { String sql=""; - + String dateType=""; + List pgInPgInfoDtoList=new ArrayList(); + PgInPgInfoDto pgInPgInfoDto=null; int type=Integer.valueOf(statisticType); switch(type) { case 0://年 - sql = "select count(*) as inPgNums from PgInPgPerson group by year(inTime)"; + dateType = "yyyy"; break; case 1://月 - sql = "select month(inTime) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by month(inTime)"; + dateType = "yyyy-mm"; break; case 2://周 - sql = "select datename(week,[inTime]) as dt,count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by datename(week,[inTime])"; + dateType = "iw"; break; case 3://日 - sql = "select day(inTime) as dt, count(*) as inPgNums from PgInPgPerson where year(inTime) = '" - + year +"' group by day(inTime)"; + dateType="yyyy-mm-dd"; break; default: break; } + sql="select count(*), to_char(t.intime, '"+dateType+"') from pg_inpg_status t where t.intime >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.intime <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.intime, '"+dateType+"')"; - List pgInPgPersonDtoList = this.getSession().createSQLQuery(sql).list(); - return pgInPgPersonDtoList; + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getMaintainByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_MAINTAIN t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i getPatrolByTime(String startTime,String endTime,String statisticType) { + + String sql=""; + String dateType=""; + List pgPatrolMaintainInfoDtoList=new ArrayList(); + PgPatrolMaintainInfoDto pgPatrolMaintainInfoDto=null; + int type=Integer.valueOf(statisticType); + switch(type) { + case 0://年 + dateType = "yyyy"; + break; + case 1://月 + dateType = "yyyy-mm"; + break; + case 2://周 + dateType = "iw"; + break; + case 3://日 + dateType="yyyy-mm-dd"; + break; + default: + break; + } + sql="select count(*), to_char(t.beginTime, '"+dateType+"') from PG_PATROL t where t.BEGINTIME >= " + + "to_date('"+startTime+"', 'yyyy-mm-dd') and t.BEGINTIME <= to_date('"+endTime+"', 'yyyy-mm-dd') group " + + "by to_char(t.BEGINTIME, '"+dateType+"')"; + + List objects = this.getSession().createSQLQuery(sql).list(); + for(int i=0;i constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception - { + public Map constructTjByDay(@FormParam("cs_beginTime") String cs_beginTime)throws Exception { Map resultMap = new HashMap(); List pgConstructTjDtoList = new ArrayList(); String msg = ""; try { pgConstructTjDtoList = pgConstructionManager.getAllConstructByDay(cs_beginTime); - if (pgConstructTjDtoList != null) - { + if (pgConstructTjDtoList != null) { msg = "获取成功"; - }else{ + } else { msg = "没有符合条件的数据"; } - }catch(Exception e) - { + } catch (Exception e) { e.printStackTrace(); msg = "获取失败"; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index f67760b..d1762a3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -202,33 +202,59 @@ return resultMap; } + /** + * 累计入廊人次 + */ + @POST + @Path("getInPgNum") + @Produces(MediaType.APPLICATION_JSON) + public Map getInPgNum() throws Exception { + Map resultMap = new HashMap(); + int inPgNum=0; + String msg = ""; + + try{ + inPgNum=pgInPgStatusManager.getInPgNum(); + + msg="入廊次数获取成功"; + } + catch(Exception e) + { + e.printStackTrace(); + msg="入廊次数获取失败"; + } + resultMap.put("msg",msg); + resultMap.put("result",inPgNum); + + return resultMap; + } /** * 根据时间统计入廊人员次数 */ - /* @POST @Path("getInPgPersonByTime") @Produces(MediaType.APPLICATION_JSON) - public Map getInPgPersonByTime(@FormParam("year") String year, + public Map getInPgPersonByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, @FormParam("statisticType") String statisticType) throws Exception { Map resultMap = new HashMap(); String msg = ""; - List pgInPgPersonDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList(); try { - pgInPgPersonDtoList = pgInPgPersonManager.getPgInPersonList(); - if (pgInPgPersonDtoList == null || pgInPgPersonDtoList.size() == 0) - msg = "没有找到入廊人员信息"; + pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonListByTime(startTime, endTime, statisticType); + if(pgInPgInfoDtoList==null) + msg="入廊人员统计信息获取失败"; else - msg = "入廊人员统计信息获取成功"; + msg="入廊人员统计信息获取成功"; } catch (Exception e) { e.printStackTrace(); msg = "入廊人员统计信息获取失败"; } resultMap.put("msg", msg); - resultMap.put("result", pgInPgPersonDtoList); + resultMap.put("result", pgInPgInfoDtoList); return resultMap; } - */ -} + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java index a310aeb..2639058 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintainRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.patroler.domain.PgMaintain; import com.casic.PgInterface.patroler.dto.PgMaintainDto; +import com.casic.PgInterface.patroler.dto.PgPatrolMaintainInfoDto; import com.casic.PgInterface.patroler.manager.PgMaintainManager; import org.springframework.stereotype.Component; @@ -170,6 +171,32 @@ return resultMap; } + /** + * 根据时间统计巡检次数 + */ + @POST + @Path("getMaintainByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getMaintainByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + List pgPatrolMaintainInfoDtoList = new ArrayList(); + try { + pgPatrolMaintainInfoDtoList = pgMaintainManager.getMaintainByTime(startTime, endTime, statisticType); + if(pgPatrolMaintainInfoDtoList==null) + msg="维护统计信息获取失败"; + else + msg="维护统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "维护统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgPatrolMaintainInfoDtoList); + return resultMap; + } } \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java index 130b873..8ac807a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgPatrolRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.patroler.domain.PgPatrol; import com.casic.PgInterface.patroler.dto.PgPatrolDto; +import com.casic.PgInterface.patroler.dto.PgPatrolMaintainInfoDto; import com.casic.PgInterface.patroler.manager.PgPatrolManager; import org.springframework.stereotype.Component; @@ -170,6 +171,33 @@ return resultMap; } + /** + * 根据时间统计巡检次数 + */ + @POST + @Path("getPatrolByTime") + @Produces(MediaType.APPLICATION_JSON) + public Map getPatrolByTime(@FormParam("startTime") String startTime, + @FormParam("endTime") String endTime, + @FormParam("statisticType") String statisticType) throws Exception { + Map resultMap = new HashMap(); + String msg = ""; + + List pgPatrolMaintainInfoDtoList = new ArrayList(); + try { + pgPatrolMaintainInfoDtoList = pgPatrolManager.getPatrolByTime(startTime, endTime, statisticType); + if(pgPatrolMaintainInfoDtoList==null) + msg="巡检统计信息获取失败"; + else + msg="巡检统计信息获取成功"; + } catch (Exception e) { + e.printStackTrace(); + msg = "巡检统计信息获取失败"; + } + resultMap.put("msg", msg); + resultMap.put("result", pgPatrolMaintainInfoDtoList); + return resultMap; + } } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5f21060..aa56bd8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,7 +16,7 @@ # db # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver -db.default.url=jdbc:oracle:thin:@192.168.0.122:1521:szgh +db.default.url=jdbc:oracle:thin:@127.0.0.1:1521:szgh db.default.username=PG db.default.password=PG 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 ba8fbf1..9e6dcac 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