diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d6a1a6b..f6a1d59 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -144,4 +144,13 @@ } + @Override + public int getTransferstationCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d6a1a6b..f6a1d59 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -144,4 +144,13 @@ } + @Override + public int getTransferstationCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index d8f1421..1fdbe7c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -140,4 +140,12 @@ } + @Override + public int getWasteBinCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d6a1a6b..f6a1d59 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -144,4 +144,13 @@ } + @Override + public int getTransferstationCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index d8f1421..1fdbe7c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -140,4 +140,12 @@ } + @Override + public int getWasteBinCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java new file mode 100644 index 0000000..d5dc260 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java @@ -0,0 +1,104 @@ +package com.casic.missiles.modular.statistic.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; +import com.casic.missiles.modular.staff.service.IStaffService; +import com.casic.missiles.modular.standingBook.service.IToiletService; +import com.casic.missiles.modular.standingBook.service.ITransferstationService; +import com.casic.missiles.modular.standingBook.service.IWasteBinService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/statistic") +public class StatisticController { + + @Autowired + private IStaffService iStaffService; + + @Autowired + private IToiletService iToiletService; + + @Autowired + private IWasteBinService iWasteBinService; + + @Autowired + private ITransferstationService iTransferstationService; + + @RequestMapping("/staff/countByType") + @ResponseBody + public Object jobStaticByDate() { + try { + + List staffStatisticDtoList=new ArrayList<>(); + staffStatisticDtoList=iStaffService.getStaffCountByType(); + + return ResponseData.success(staffStatisticDtoList); + } catch (Exception ex) { + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + // type表示统计维度： staff表示人员，car表示车辆，wastebin表示垃圾桶， toilet表示公厕，transferstation表示中转站 + @RequestMapping("staff") + @ResponseBody + public Object staff(){ + try{ + int count=iStaffService.getStaffCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("wastbin") + @ResponseBody + public Object wastbin(){ + + try{ + int count =iWasteBinService.getWasteBinCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("toilet") + @ResponseBody + public Object toilet(){ + + try{ + int count =iToiletService.getToiletCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("transferstation") + @ResponseBody + public Object transferstation(){ + + try{ + int count =iTransferstationService.getTransferstationCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + +} \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d6a1a6b..f6a1d59 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -144,4 +144,13 @@ } + @Override + public int getTransferstationCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index d8f1421..1fdbe7c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -140,4 +140,12 @@ } + @Override + public int getWasteBinCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java new file mode 100644 index 0000000..d5dc260 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java @@ -0,0 +1,104 @@ +package com.casic.missiles.modular.statistic.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; +import com.casic.missiles.modular.staff.service.IStaffService; +import com.casic.missiles.modular.standingBook.service.IToiletService; +import com.casic.missiles.modular.standingBook.service.ITransferstationService; +import com.casic.missiles.modular.standingBook.service.IWasteBinService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/statistic") +public class StatisticController { + + @Autowired + private IStaffService iStaffService; + + @Autowired + private IToiletService iToiletService; + + @Autowired + private IWasteBinService iWasteBinService; + + @Autowired + private ITransferstationService iTransferstationService; + + @RequestMapping("/staff/countByType") + @ResponseBody + public Object jobStaticByDate() { + try { + + List staffStatisticDtoList=new ArrayList<>(); + staffStatisticDtoList=iStaffService.getStaffCountByType(); + + return ResponseData.success(staffStatisticDtoList); + } catch (Exception ex) { + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + // type表示统计维度： staff表示人员，car表示车辆，wastebin表示垃圾桶， toilet表示公厕，transferstation表示中转站 + @RequestMapping("staff") + @ResponseBody + public Object staff(){ + try{ + int count=iStaffService.getStaffCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("wastbin") + @ResponseBody + public Object wastbin(){ + + try{ + int count =iWasteBinService.getWasteBinCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("toilet") + @ResponseBody + public Object toilet(){ + + try{ + int count =iToiletService.getToiletCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("transferstation") + @ResponseBody + public Object transferstation(){ + + try{ + int count =iTransferstationService.getTransferstationCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + +} \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d6a1a6b..f6a1d59 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -144,4 +144,13 @@ } + @Override + public int getTransferstationCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index d8f1421..1fdbe7c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -140,4 +140,12 @@ } + @Override + public int getWasteBinCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java new file mode 100644 index 0000000..d5dc260 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java @@ -0,0 +1,104 @@ +package com.casic.missiles.modular.statistic.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; +import com.casic.missiles.modular.staff.service.IStaffService; +import com.casic.missiles.modular.standingBook.service.IToiletService; +import com.casic.missiles.modular.standingBook.service.ITransferstationService; +import com.casic.missiles.modular.standingBook.service.IWasteBinService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/statistic") +public class StatisticController { + + @Autowired + private IStaffService iStaffService; + + @Autowired + private IToiletService iToiletService; + + @Autowired + private IWasteBinService iWasteBinService; + + @Autowired + private ITransferstationService iTransferstationService; + + @RequestMapping("/staff/countByType") + @ResponseBody + public Object jobStaticByDate() { + try { + + List staffStatisticDtoList=new ArrayList<>(); + staffStatisticDtoList=iStaffService.getStaffCountByType(); + + return ResponseData.success(staffStatisticDtoList); + } catch (Exception ex) { + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + // type表示统计维度： staff表示人员，car表示车辆，wastebin表示垃圾桶， toilet表示公厕，transferstation表示中转站 + @RequestMapping("staff") + @ResponseBody + public Object staff(){ + try{ + int count=iStaffService.getStaffCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("wastbin") + @ResponseBody + public Object wastbin(){ + + try{ + int count =iWasteBinService.getWasteBinCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("toilet") + @ResponseBody + public Object toilet(){ + + try{ + int count =iToiletService.getToiletCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("transferstation") + @ResponseBody + public Object transferstation(){ + + try{ + int count =iTransferstationService.getTransferstationCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + +} \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java index f2eac9d..59b36a6 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java @@ -52,6 +52,13 @@ @TableField("WORK_CONTENT") private String workContent; + @TableField("START_TIME") + private Date startTime; + + + @TableField("END_TIME") + private Date endTime; + public Long getId() { return id; } @@ -132,4 +139,20 @@ this.workContent = workContent; } + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d6a1a6b..f6a1d59 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -144,4 +144,13 @@ } + @Override + public int getTransferstationCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index d8f1421..1fdbe7c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -140,4 +140,12 @@ } + @Override + public int getWasteBinCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java new file mode 100644 index 0000000..d5dc260 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java @@ -0,0 +1,104 @@ +package com.casic.missiles.modular.statistic.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; +import com.casic.missiles.modular.staff.service.IStaffService; +import com.casic.missiles.modular.standingBook.service.IToiletService; +import com.casic.missiles.modular.standingBook.service.ITransferstationService; +import com.casic.missiles.modular.standingBook.service.IWasteBinService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/statistic") +public class StatisticController { + + @Autowired + private IStaffService iStaffService; + + @Autowired + private IToiletService iToiletService; + + @Autowired + private IWasteBinService iWasteBinService; + + @Autowired + private ITransferstationService iTransferstationService; + + @RequestMapping("/staff/countByType") + @ResponseBody + public Object jobStaticByDate() { + try { + + List staffStatisticDtoList=new ArrayList<>(); + staffStatisticDtoList=iStaffService.getStaffCountByType(); + + return ResponseData.success(staffStatisticDtoList); + } catch (Exception ex) { + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + // type表示统计维度： staff表示人员，car表示车辆，wastebin表示垃圾桶， toilet表示公厕，transferstation表示中转站 + @RequestMapping("staff") + @ResponseBody + public Object staff(){ + try{ + int count=iStaffService.getStaffCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("wastbin") + @ResponseBody + public Object wastbin(){ + + try{ + int count =iWasteBinService.getWasteBinCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("toilet") + @ResponseBody + public Object toilet(){ + + try{ + int count =iToiletService.getToiletCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("transferstation") + @ResponseBody + public Object transferstation(){ + + try{ + int count =iTransferstationService.getTransferstationCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + +} \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java index f2eac9d..59b36a6 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java @@ -52,6 +52,13 @@ @TableField("WORK_CONTENT") private String workContent; + @TableField("START_TIME") + private Date startTime; + + + @TableField("END_TIME") + private Date endTime; + public Long getId() { return id; } @@ -132,4 +139,20 @@ this.workContent = workContent; } + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java index 5b97190..2f0b144 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.modular.toilet.dto.ToiletEvaluateDto; import com.casic.missiles.modular.toilet.model.ToiletClean; import com.casic.missiles.modular.toilet.service.IToiletCleanService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -118,11 +119,11 @@ EntityWrapper query = new EntityWrapper<>(); - query.setSqlSelect("count(*),DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); + query.setSqlSelect("count(*),TOILET_ID,DATE_FORMAT(START_TIME,'" + getStatisticType(staticType) + "') as dt"); if (ToolUtil.isNotEmpty(startTime)) - query.ge("CREATE_TIME", startTime); + query.ge("START_TIME", startTime); if (ToolUtil.isNotEmpty(endTime)) - query.le("CREATE_TIME", endTime); + query.le("START_TIME", endTime); query.groupBy("dt"); @@ -130,10 +131,16 @@ String dt = "dt"; String count = "count(*)"; + String toiletId="TOILET_ID"; for (Map map : obMap) { JobStaticDto jobStaticDto = new JobStaticDto(); jobStaticDto.setStaticDate(map.get(dt).toString()); jobStaticDto.setCleanNum(map.get(count).toString()); + + String id = map.get(toiletId).toString(); + if (StringUtils.isNotBlank(id) && iToiletService.selectById(id) != null) + jobStaticDto.setToiletName(iToiletService.selectById(id).getName()); + jobStaticDtoList.add(jobStaticDto); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d6a1a6b..f6a1d59 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -144,4 +144,13 @@ } + @Override + public int getTransferstationCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index d8f1421..1fdbe7c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -140,4 +140,12 @@ } + @Override + public int getWasteBinCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java new file mode 100644 index 0000000..d5dc260 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java @@ -0,0 +1,104 @@ +package com.casic.missiles.modular.statistic.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; +import com.casic.missiles.modular.staff.service.IStaffService; +import com.casic.missiles.modular.standingBook.service.IToiletService; +import com.casic.missiles.modular.standingBook.service.ITransferstationService; +import com.casic.missiles.modular.standingBook.service.IWasteBinService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/statistic") +public class StatisticController { + + @Autowired + private IStaffService iStaffService; + + @Autowired + private IToiletService iToiletService; + + @Autowired + private IWasteBinService iWasteBinService; + + @Autowired + private ITransferstationService iTransferstationService; + + @RequestMapping("/staff/countByType") + @ResponseBody + public Object jobStaticByDate() { + try { + + List staffStatisticDtoList=new ArrayList<>(); + staffStatisticDtoList=iStaffService.getStaffCountByType(); + + return ResponseData.success(staffStatisticDtoList); + } catch (Exception ex) { + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + // type表示统计维度： staff表示人员，car表示车辆，wastebin表示垃圾桶， toilet表示公厕，transferstation表示中转站 + @RequestMapping("staff") + @ResponseBody + public Object staff(){ + try{ + int count=iStaffService.getStaffCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("wastbin") + @ResponseBody + public Object wastbin(){ + + try{ + int count =iWasteBinService.getWasteBinCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("toilet") + @ResponseBody + public Object toilet(){ + + try{ + int count =iToiletService.getToiletCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("transferstation") + @ResponseBody + public Object transferstation(){ + + try{ + int count =iTransferstationService.getTransferstationCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + +} \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java index f2eac9d..59b36a6 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java @@ -52,6 +52,13 @@ @TableField("WORK_CONTENT") private String workContent; + @TableField("START_TIME") + private Date startTime; + + + @TableField("END_TIME") + private Date endTime; + public Long getId() { return id; } @@ -132,4 +139,20 @@ this.workContent = workContent; } + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java index 5b97190..2f0b144 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.modular.toilet.dto.ToiletEvaluateDto; import com.casic.missiles.modular.toilet.model.ToiletClean; import com.casic.missiles.modular.toilet.service.IToiletCleanService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -118,11 +119,11 @@ EntityWrapper query = new EntityWrapper<>(); - query.setSqlSelect("count(*),DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); + query.setSqlSelect("count(*),TOILET_ID,DATE_FORMAT(START_TIME,'" + getStatisticType(staticType) + "') as dt"); if (ToolUtil.isNotEmpty(startTime)) - query.ge("CREATE_TIME", startTime); + query.ge("START_TIME", startTime); if (ToolUtil.isNotEmpty(endTime)) - query.le("CREATE_TIME", endTime); + query.le("START_TIME", endTime); query.groupBy("dt"); @@ -130,10 +131,16 @@ String dt = "dt"; String count = "count(*)"; + String toiletId="TOILET_ID"; for (Map map : obMap) { JobStaticDto jobStaticDto = new JobStaticDto(); jobStaticDto.setStaticDate(map.get(dt).toString()); jobStaticDto.setCleanNum(map.get(count).toString()); + + String id = map.get(toiletId).toString(); + if (StringUtils.isNotBlank(id) && iToiletService.selectById(id) != null) + jobStaticDto.setToiletName(iToiletService.selectById(id).getName()); + jobStaticDtoList.add(jobStaticDto); } diff --git a/casic-web/pom.xml b/casic-web/pom.xml index db6f058..8883953 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -70,11 +70,11 @@ casic-service-car ${pro.version} - + com.casic casic-service-infrastructure diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java new file mode 100644 index 0000000..0530136 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/dto/StaffStatisticDto.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.staff.dto; + +public class StaffStatisticDto { + + private String name; + private int count; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + +} diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java index b2e97c5..242acea 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/IStaffService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -25,4 +26,7 @@ List list(String keywords, String type, String post, String jobCode, String responseArea); + List getStaffCountByType(); + + int getStaffCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java index ae4666e..c03919c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/staff/service/impl/StaffServiceImpl.java @@ -6,9 +6,9 @@ import com.casic.missiles.core.common.service.ICommonPermissionService; import com.casic.missiles.modular.staff.dao.StaffMapper; import com.casic.missiles.modular.staff.dto.StaffDto; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; import com.casic.missiles.modular.staff.model.Staff; import com.casic.missiles.modular.staff.service.IStaffService; -import com.casic.missiles.modular.standingBook.model.Toilet; import com.casic.missiles.modular.standingBook.tool.ExcelTool; import com.casic.missiles.modular.standingBook.tool.ExcelUtil; import org.apache.commons.lang.StringUtils; @@ -139,4 +139,44 @@ } } + @Override + public List getStaffCountByType(){ + + List staffStatisticDtoList=new ArrayList<>(); + + EntityWrapper query = new EntityWrapper<>(); + + query.setSqlSelect("count(*),type"); + + query.eq("DEL_FLAG", 0); + query.groupBy("type"); + + List> obMap = this.selectMaps(query); + + String type = "type"; + String count = "count(*)"; + for (Map map : obMap) { + StaffStatisticDto staffStatisticDto=new StaffStatisticDto(); + String _type=map.get(type).toString(); + if(StringUtils.isNotBlank(_type)) + staffStatisticDto.setName(iCommonPermissionService.getDictNameByCode("staffType",_type)); + else + staffStatisticDto.setName(""); + staffStatisticDto.setCount(Integer.valueOf(map.get(count).toString())); + staffStatisticDtoList.add(staffStatisticDto); + } + + return staffStatisticDtoList; + } + + @Override + public int getStaffCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java index 9525ba1..9966586 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IToiletService.java @@ -22,4 +22,6 @@ void ImpExcelData(MultipartFile file); List list(String keywords, String owner, String position); + + int getToiletCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java index 1cab2e2..1b73f9d 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/ITransferstationService.java @@ -22,4 +22,5 @@ void ImpExcelData(MultipartFile file); + int getTransferstationCount(); } diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java index 0a45a10..73f0499 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/IWasteBinService.java @@ -23,4 +23,5 @@ void ImpExcelData(MultipartFile file); + int getWasteBinCount(); } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java index 525854b..3b27980 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/ToiletServiceImpl.java @@ -136,4 +136,13 @@ } + @Override + public int getToiletCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java index d6a1a6b..f6a1d59 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/TransferstationServiceImpl.java @@ -144,4 +144,13 @@ } + @Override + public int getTransferstationCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } + } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java index d8f1421..1fdbe7c 100644 --- a/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/standingBook/service/impl/WasteBinServiceImpl.java @@ -140,4 +140,12 @@ } + @Override + public int getWasteBinCount(){ + EntityWrapper query = new EntityWrapper<>(); + query.eq("DEL_FLAG", 0); + + int count=this.selectCount(query); + return count; + } } \ No newline at end of file diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java new file mode 100644 index 0000000..d5dc260 --- /dev/null +++ b/casic-service-person/src/main/java/com/casic/missiles/modular/statistic/controller/StatisticController.java @@ -0,0 +1,104 @@ +package com.casic.missiles.modular.statistic.controller; + +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.staff.dto.StaffStatisticDto; +import com.casic.missiles.modular.staff.service.IStaffService; +import com.casic.missiles.modular.standingBook.service.IToiletService; +import com.casic.missiles.modular.standingBook.service.ITransferstationService; +import com.casic.missiles.modular.standingBook.service.IWasteBinService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/statistic") +public class StatisticController { + + @Autowired + private IStaffService iStaffService; + + @Autowired + private IToiletService iToiletService; + + @Autowired + private IWasteBinService iWasteBinService; + + @Autowired + private ITransferstationService iTransferstationService; + + @RequestMapping("/staff/countByType") + @ResponseBody + public Object jobStaticByDate() { + try { + + List staffStatisticDtoList=new ArrayList<>(); + staffStatisticDtoList=iStaffService.getStaffCountByType(); + + return ResponseData.success(staffStatisticDtoList); + } catch (Exception ex) { + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + // type表示统计维度： staff表示人员，car表示车辆，wastebin表示垃圾桶， toilet表示公厕，transferstation表示中转站 + @RequestMapping("staff") + @ResponseBody + public Object staff(){ + try{ + int count=iStaffService.getStaffCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("wastbin") + @ResponseBody + public Object wastbin(){ + + try{ + int count =iWasteBinService.getWasteBinCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("toilet") + @ResponseBody + public Object toilet(){ + + try{ + int count =iToiletService.getToiletCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + + @RequestMapping("transferstation") + @ResponseBody + public Object transferstation(){ + + try{ + int count =iTransferstationService.getTransferstationCount(); + return ResponseData.success(count); + } + catch(Exception ex){ + ex.printStackTrace(); + } + return ResponseData.error("请求失败"); + } + +} \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java index cf2a909..359bb4f 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletStatistic.java @@ -42,6 +42,4 @@ return ResponseData.error("请求失败"); } - - } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java index f2eac9d..59b36a6 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java @@ -52,6 +52,13 @@ @TableField("WORK_CONTENT") private String workContent; + @TableField("START_TIME") + private Date startTime; + + + @TableField("END_TIME") + private Date endTime; + public Long getId() { return id; } @@ -132,4 +139,20 @@ this.workContent = workContent; } + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + } \ No newline at end of file diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java index 5b97190..2f0b144 100644 --- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java +++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java @@ -16,6 +16,7 @@ import com.casic.missiles.modular.toilet.dto.ToiletEvaluateDto; import com.casic.missiles.modular.toilet.model.ToiletClean; import com.casic.missiles.modular.toilet.service.IToiletCleanService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -118,11 +119,11 @@ EntityWrapper query = new EntityWrapper<>(); - query.setSqlSelect("count(*),DATE_FORMAT(CREATE_TIME,'" + getStatisticType(staticType) + "') as dt"); + query.setSqlSelect("count(*),TOILET_ID,DATE_FORMAT(START_TIME,'" + getStatisticType(staticType) + "') as dt"); if (ToolUtil.isNotEmpty(startTime)) - query.ge("CREATE_TIME", startTime); + query.ge("START_TIME", startTime); if (ToolUtil.isNotEmpty(endTime)) - query.le("CREATE_TIME", endTime); + query.le("START_TIME", endTime); query.groupBy("dt"); @@ -130,10 +131,16 @@ String dt = "dt"; String count = "count(*)"; + String toiletId="TOILET_ID"; for (Map map : obMap) { JobStaticDto jobStaticDto = new JobStaticDto(); jobStaticDto.setStaticDate(map.get(dt).toString()); jobStaticDto.setCleanNum(map.get(count).toString()); + + String id = map.get(toiletId).toString(); + if (StringUtils.isNotBlank(id) && iToiletService.selectById(id) != null) + jobStaticDto.setToiletName(iToiletService.selectById(id).getName()); + jobStaticDtoList.add(jobStaticDto); } diff --git a/casic-web/pom.xml b/casic-web/pom.xml index db6f058..8883953 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -70,11 +70,11 @@ casic-service-car ${pro.version} - + com.casic casic-service-infrastructure diff --git a/pom.xml b/pom.xml index c668051..cc4fc7f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ casic-service-person casic-service-toilet casic-service-support - casic-service-job-monitor + org.springframework.boot