Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseGgpFacilityServiceImpl.java

@@ -57,19 +57,35 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
     public List<BaseGgpFacilityStatisticVO> statistic(BaseGgpFacilityVO baseGgpFacilityVO){
         List<BaseGgpFacilityStatisticVO> list = new ArrayList<>();
         QueryWrapper<BaseGgpFacility> queryWrapper = Wrappers.query();
-        queryWrapper.select("street_town as streetTown","count(*) as count")
-                .in("facility_type",baseGgpFacilityVO.getFacilityType())
-                .groupBy("street_town");
-        List<Map<String,Object>> maps = this.listMaps(queryWrapper);
-        if(maps.size() > 0){
-            for (int i = 0; i < maps.size(); i++) {
-                BaseGgpFacilityStatisticVO statisticVO = new BaseGgpFacilityStatisticVO();
-                statisticVO.setStreetTown(maps.get(i).get("streetTown").toString());
-                statisticVO.setCount(Integer.parseInt(maps.get(i).get("count").toString()));
-                list.add(statisticVO);
+        if(baseGgpFacilityVO.getStatisticType().equals("street")){
+            queryWrapper.select("street_town as streetTown","count(*) as count")
+                    .in("facility_type",baseGgpFacilityVO.getFacilityType())
+                    .groupBy("street_town");
+            List<Map<String,Object>> maps = this.listMaps(queryWrapper);
+            if(maps.size() > 0){
+                for (int i = 0; i < maps.size(); i++) {
+                    BaseGgpFacilityStatisticVO statisticVO = new BaseGgpFacilityStatisticVO();
+                    statisticVO.setStreetTown(maps.get(i).get("streetTown").toString());
+                    statisticVO.setCount(Integer.parseInt(maps.get(i).get("count").toString()));
+                    list.add(statisticVO);
+                }
+            }
+        }else if(baseGgpFacilityVO.getStatisticType().equals("facilityType")){
+            queryWrapper.select("facility_type as facilityType","count(*) as count")
+                    .in("facility_type",baseGgpFacilityVO.getFacilityType())
+                    .groupBy("facility_type");
+            List<Map<String,Object>> maps = this.listMaps(queryWrapper);
+            if(maps.size() > 0){
+                for (int i = 0; i < maps.size(); i++) {
+                    BaseGgpFacilityStatisticVO statisticVO = new BaseGgpFacilityStatisticVO();
+                    statisticVO.setFacilityType(Integer.parseInt(maps.get(i).get("facilityType").toString()));
+                    statisticVO.setCount(Integer.parseInt(maps.get(i).get("count").toString()));
+                    list.add(statisticVO);
+                }
             }
         }
 
+
         return list;
     }
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseGgpFacilityStatisticVO.java

@@ -4,6 +4,10 @@ import lombok.Data;
 
 @Data
 public class BaseGgpFacilityStatisticVO {
+    /**
+     * 设施类型
+     */
+    private Integer facilityType;
 
     /**
      * 所属街镇

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseGgpFacilityVO.java

@@ -19,6 +19,8 @@ public class BaseGgpFacilityVO {
 
         private String streetTown;
 
+        private String statisticType; //统计类型（”facilityType“，”street“）
+
         private List<Integer> facilityType;
 
 }