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

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BaseGgpFacilityController.java

@@ -38,12 +38,12 @@ public class BaseGgpFacilityController {
 
     /**
      * 统计
-     * @param facilityType
+     * @param baseGgpFacilityVO
      * @return
      */
-    @GetMapping("statistic")
-    public ApiResult<List<BaseGgpFacilityStatisticVO>> statistic(@RequestParam(value = "facilityType") Integer facilityType){
-        return ApiResult.success(baseGgpFacilityService.statistic(facilityType));
+    @PostMapping("statistic")
+    public ApiResult<List<BaseGgpFacilityStatisticVO>> statistic(@RequestBody BaseGgpFacilityVO baseGgpFacilityVO){
+        return ApiResult.success(baseGgpFacilityService.statistic(baseGgpFacilityVO));
     }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemGridMemderStatisticController.java

@@ -0,0 +1,45 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.DemGridMemderStatistic;
+import com.usky.fire.service.DemGridMemderStatisticService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 网格基础信息统计表 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+@RestController
+@RequestMapping("/demGridMemderStatistic")
+public class DemGridMemderStatisticController {
+
+    @Autowired
+    private DemGridMemderStatisticService demGridMemderStatisticService;
+
+    /**
+     * 网格基础信息统计
+     * @param id 网格员管理表主键ID
+     * @param gridGrade  网格等级(2、中网格 3、小网格)
+     * @return
+     */
+    @GetMapping("gridMemderStatistic")
+    public ApiResult<DemGridMemderStatistic> gridMemderStatistic(@RequestParam(value = "id",required = false) Integer id,
+                                                                       @RequestParam(value = "gridGrade",required = false) Integer gridGrade){
+        return ApiResult.success(demGridMemderStatisticService.gridMemderStatistic(id,gridGrade));
+    }
+
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemGridMemderStatistic.java

@@ -0,0 +1,140 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 网格基础信息统计表
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemGridMemderStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 网格员管理表主键ID
+     */
+    private Integer gridMemberId;
+
+    /**
+     * 网格员人数
+     */
+    private Integer personnelNum;
+
+    /**
+     * 居民小区数量
+     */
+    private Integer villageNum;
+
+    /**
+     * 高层建筑数量
+     */
+    private Integer highRiseNum;
+
+    /**
+     * 办公楼宇数量
+     */
+    private Integer officeBuildingsNum;
+
+    /**
+     * 沿街门面店数量
+     */
+    private Integer streetFrontNum;
+
+    /**
+     * 重点单位数量
+     */
+    private Integer keyCompanyNum;
+
+    /**
+     * 厂房仓库数量
+     */
+    private Integer factoryStoreNum;
+
+    /**
+     * 医疗机构数量
+     */
+    private Integer medicalInstitutionNum;
+
+    /**
+     * 学校数量
+     */
+    private Integer schoolNum;
+
+    /**
+     * 养老机构数量
+     */
+    private Integer elderCareNum;
+
+    /**
+     * 综合体数量
+     */
+    private Integer largeBuildNum;
+
+    /**
+     * 商市场数量
+     */
+    private Integer dealerMarketNum;
+
+    /**
+     * 公共娱乐场所数量
+     */
+    private Integer pulicEntertainmentNum;
+
+    /**
+     * 宗教场所数量
+     */
+    private Integer religiousPlacesNum;
+
+    /**
+     * 宾馆数量
+     */
+    private Integer hotelNum;
+
+    /**
+     * 规模租赁数量
+     */
+    private Integer scaleRentNum;
+
+    /**
+     * 加油站数量
+     */
+    private Integer gasStationNum;
+
+    /**
+     * 地铁车站数量
+     */
+    private Integer subwayStationNum;
+
+    /**
+     * 在建工地数量
+     */
+    private Integer constructionSiteNum;
+
+    /**
+     * 社会消防组织数量
+     */
+    private Integer communityNum;
+
+    /**
+     * 其他数量
+     */
+    private Integer otherNum;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemGridMemderStatisticMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemGridMemderStatistic;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 网格基础信息统计表 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+public interface DemGridMemderStatisticMapper extends CrudMapper<DemGridMemderStatistic> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BaseGgpFacilityService.java

@@ -28,5 +28,5 @@ public interface BaseGgpFacilityService extends CrudService<BaseGgpFacility> {
      */
     List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO);
 
-    List<BaseGgpFacilityStatisticVO> statistic(Integer facilityType);
+    List<BaseGgpFacilityStatisticVO> statistic(BaseGgpFacilityVO baseGgpFacilityVO);
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemGridMemderStatisticService.java

@@ -0,0 +1,19 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.DemGridMemderStatistic;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 网格基础信息统计表 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+public interface DemGridMemderStatisticService extends CrudService<DemGridMemderStatistic> {
+
+    DemGridMemderStatistic gridMemderStatistic(Integer id, Integer gridGrade);
+}

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

@@ -54,11 +54,11 @@ public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacil
     }
 
     @Override
-    public List<BaseGgpFacilityStatisticVO> statistic(Integer facilityType){
+    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")
-                .eq("facility_type",facilityType)
+                .in("facility_type",baseGgpFacilityVO.getFacilityType())
                 .groupBy("street_town");
         List<Map<String,Object>> maps = this.listMaps(queryWrapper);
         if(maps.size() > 0){

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

@@ -0,0 +1,203 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.DemGridMember;
+import com.usky.fire.domain.DemGridMemderStatistic;
+import com.usky.fire.mapper.DemGridMemderStatisticMapper;
+import com.usky.fire.service.DemGridMemberService;
+import com.usky.fire.service.DemGridMemderStatisticService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * <p>
+ * 网格基础信息统计表 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-10-30
+ */
+@Service
+public class DemGridMemderStatisticServiceImpl extends AbstractCrudService<DemGridMemderStatisticMapper, DemGridMemderStatistic> implements DemGridMemderStatisticService {
+
+    @Autowired
+    private DemGridMemberService demGridMemberService;
+
+    @Override
+    public DemGridMemderStatistic gridMemderStatistic(Integer id, Integer gridGrade){
+        DemGridMemderStatistic gridMemderStatistic = new DemGridMemderStatistic();
+
+        QueryWrapper<DemGridMemderStatistic> queryWrapper = Wrappers.query();
+        if(gridGrade == null){
+            queryWrapper.select("SUM(personnel_num) as personnelNum","SUM(village_num) as villageNum","SUM(high_rise_num) as highRiseNum","SUM(office_buildings_num) as officeBuildingsNum","SUM(street_front_num) as streetFrontNum","SUM(key_company_num) as keyCompanyNum","SUM(factory_store_num) as factoryStoreNum","SUM(medical_institution_num) as medicalInstitutionNum","SUM(school_num) as schoolNum","SUM(elder_care_num) as elderCareNum","SUM(large_build_num) as largeBuildNum","SUM(dealer_market_num) as dealerMarketNum","SUM(pulic_entertainment_num) as pulicEntertainmentNum","SUM(religious_places_num) as religiousPlacesNum","SUM(hotel_num) as hotelNum","SUM(scale_rent_num) as scaleRentNum","SUM(gas_station_num) as gasStationNum","SUM(subway_station_num) as subwayStationNum","SUM(construction_site_num) as constructionSiteNum","SUM(community_num) as communityNum","SUM(other_num) as otherNum");
+
+        }else{
+            if(gridGrade == 2){
+                LambdaQueryWrapper<DemGridMember> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.eq(DemGridMember::getSeniorGrid,id);
+                List<Integer> idList = new ArrayList<>();
+                List<DemGridMember> queryList = demGridMemberService.list(queryWrapper1);
+                if(queryList.size() > 0){
+                    for (int i = 0; i < queryList.size(); i++) {
+                        idList.add(queryList.get(i).getId());
+                    }
+                }
+
+                if(idList.size() > 0){
+                    queryWrapper.select("SUM(personnel_num) as personnelNum","SUM(village_num) as villageNum","SUM(high_rise_num) as highRiseNum","SUM(office_buildings_num) as officeBuildingsNum","SUM(street_front_num) as streetFrontNum","SUM(key_company_num) as keyCompanyNum","SUM(factory_store_num) as factoryStoreNum","SUM(medical_institution_num) as medicalInstitutionNum","SUM(school_num) as schoolNum","SUM(elder_care_num) as elderCareNum","SUM(large_build_num) as largeBuildNum","SUM(dealer_market_num) as dealerMarketNum","SUM(pulic_entertainment_num) as pulicEntertainmentNum","SUM(religious_places_num) as religiousPlacesNum","SUM(hotel_num) as hotelNum","SUM(scale_rent_num) as scaleRentNum","SUM(gas_station_num) as gasStationNum","SUM(subway_station_num) as subwayStationNum","SUM(construction_site_num) as constructionSiteNum","SUM(community_num) as communityNum","SUM(other_num) as otherNum")
+                            .in("grid_member_id",idList);
+                }
+
+            }else if(gridGrade == 3){
+                queryWrapper.select("SUM(personnel_num) as personnelNum","SUM(village_num) as villageNum","SUM(high_rise_num) as highRiseNum","SUM(office_buildings_num) as officeBuildingsNum"
+                        ,"SUM(street_front_num) as streetFrontNum","SUM(key_company_num) as keyCompanyNum","SUM(factory_store_num) as factoryStoreNum"
+                        ,"SUM(medical_institution_num) as medicalInstitutionNum","SUM(school_num) as schoolNum","SUM(elder_care_num) as elderCareNum"
+                        ,"SUM(large_build_num) as largeBuildNum","SUM(dealer_market_num) as dealerMarketNum","SUM(pulic_entertainment_num) as pulicEntertainmentNum"
+                        ,"SUM(religious_places_num) as religiousPlacesNum","SUM(hotel_num) as hotelNum","SUM(scale_rent_num) as scaleRentNum"
+                        ,"SUM(gas_station_num) as gasStationNum","SUM(subway_station_num) as subwayStationNum","SUM(construction_site_num) as constructionSiteNum"
+                        ,"SUM(community_num) as communityNum","SUM(other_num) as otherNum")
+                        .eq("grid_member_id",id);
+            }
+
+        }
+        List<Map<String,Object>> maps = this.listMaps(queryWrapper);
+        if(maps.size() > 0){
+            if(Objects.isNull(maps.get(0).get("personnelNum"))){
+                gridMemderStatistic.setPersonnelNum(0);
+            }else{
+                gridMemderStatistic.setPersonnelNum(Integer.parseInt(maps.get(0).get("personnelNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("villageNum"))){
+                gridMemderStatistic.setVillageNum(0);
+            }else{
+                gridMemderStatistic.setVillageNum(Integer.parseInt(maps.get(0).get("villageNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("highRiseNum"))){
+                gridMemderStatistic.setHighRiseNum(0);
+            }else{
+                gridMemderStatistic.setHighRiseNum(Integer.parseInt(maps.get(0).get("highRiseNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("officeBuildingsNum"))){
+                gridMemderStatistic.setOfficeBuildingsNum(0);
+            }else{
+                gridMemderStatistic.setOfficeBuildingsNum(Integer.parseInt(maps.get(0).get("officeBuildingsNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("streetFrontNum"))){
+                gridMemderStatistic.setStreetFrontNum(0);
+            }else{
+                gridMemderStatistic.setStreetFrontNum(Integer.parseInt(maps.get(0).get("streetFrontNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("keyCompanyNum"))){
+                gridMemderStatistic.setKeyCompanyNum(0);
+            }else{
+                gridMemderStatistic.setKeyCompanyNum(Integer.parseInt(maps.get(0).get("keyCompanyNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("factoryStoreNum"))){
+                gridMemderStatistic.setFactoryStoreNum(0);
+            }else{
+                gridMemderStatistic.setFactoryStoreNum(Integer.parseInt(maps.get(0).get("factoryStoreNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("medicalInstitutionNum"))){
+                gridMemderStatistic.setMedicalInstitutionNum(0);
+            }else{
+                gridMemderStatistic.setMedicalInstitutionNum(Integer.parseInt(maps.get(0).get("medicalInstitutionNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("schoolNum"))){
+                gridMemderStatistic.setSchoolNum(0);
+            }else{
+                gridMemderStatistic.setSchoolNum(Integer.parseInt(maps.get(0).get("schoolNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("elderCareNum"))){
+                gridMemderStatistic.setElderCareNum(0);
+            }else{
+                gridMemderStatistic.setElderCareNum(Integer.parseInt(maps.get(0).get("elderCareNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("largeBuildNum"))){
+                gridMemderStatistic.setLargeBuildNum(0);
+            }else{
+                gridMemderStatistic.setLargeBuildNum(Integer.parseInt(maps.get(0).get("largeBuildNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("dealerMarketNum"))){
+                gridMemderStatistic.setDealerMarketNum(0);
+            }else{
+                gridMemderStatistic.setDealerMarketNum(Integer.parseInt(maps.get(0).get("dealerMarketNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("pulicEntertainmentNum"))){
+                gridMemderStatistic.setPulicEntertainmentNum(0);
+            }else{
+                gridMemderStatistic.setPulicEntertainmentNum(Integer.parseInt(maps.get(0).get("pulicEntertainmentNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("religiousPlacesNum"))){
+                gridMemderStatistic.setReligiousPlacesNum(0);
+            }else{
+                gridMemderStatistic.setReligiousPlacesNum(Integer.parseInt(maps.get(0).get("religiousPlacesNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("hotelNum"))){
+                gridMemderStatistic.setHotelNum(0);
+            }else{
+                gridMemderStatistic.setHotelNum(Integer.parseInt(maps.get(0).get("hotelNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("scaleRentNum"))){
+                gridMemderStatistic.setScaleRentNum(0);
+            }else{
+                gridMemderStatistic.setScaleRentNum(Integer.parseInt(maps.get(0).get("scaleRentNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("gasStationNum"))){
+                gridMemderStatistic.setGasStationNum(0);
+            }else{
+                gridMemderStatistic.setGasStationNum(Integer.parseInt(maps.get(0).get("gasStationNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("subwayStationNum"))){
+                gridMemderStatistic.setSubwayStationNum(0);
+            }else{
+                gridMemderStatistic.setSubwayStationNum(Integer.parseInt(maps.get(0).get("subwayStationNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("constructionSiteNum"))){
+                gridMemderStatistic.setConstructionSiteNum(0);
+            }else{
+                gridMemderStatistic.setConstructionSiteNum(Integer.parseInt(maps.get(0).get("constructionSiteNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("communityNum"))){
+                gridMemderStatistic.setCommunityNum(0);
+            }else{
+                gridMemderStatistic.setCommunityNum(Integer.parseInt(maps.get(0).get("communityNum").toString()));
+            }
+
+            if(Objects.isNull(maps.get(0).get("otherNum"))){
+                gridMemderStatistic.setOtherNum(0);
+            }else{
+                gridMemderStatistic.setOtherNum(Integer.parseInt(maps.get(0).get("otherNum").toString()));
+            }
+
+        }
+
+        return gridMemderStatistic;
+    }
+}

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemGridMemderStatisticMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemGridMemderStatisticMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemGridMemderStatistic">
+        <id column="id" property="id" />
+        <result column="grid_member_id" property="gridMemberId" />
+        <result column="personnel_num" property="personnelNum" />
+        <result column="village_num" property="villageNum" />
+        <result column="high_rise_num" property="highRiseNum" />
+        <result column="office_buildings_num" property="officeBuildingsNum" />
+        <result column="street_front_num" property="streetFrontNum" />
+        <result column="key_company_num" property="keyCompanyNum" />
+        <result column="factory_store_num" property="factoryStoreNum" />
+        <result column="medical_institution_num" property="medicalInstitutionNum" />
+        <result column="school_num" property="schoolNum" />
+        <result column="elder_care_num" property="elderCareNum" />
+        <result column="large_build_num" property="largeBuildNum" />
+        <result column="dealer_market_num" property="dealerMarketNum" />
+        <result column="pulic_entertainment_num" property="pulicEntertainmentNum" />
+        <result column="religious_places_num" property="religiousPlacesNum" />
+        <result column="hotel_num" property="hotelNum" />
+        <result column="scale_rent_num" property="scaleRentNum" />
+        <result column="gas_station_num" property="gasStationNum" />
+        <result column="subway_station_num" property="subwayStationNum" />
+        <result column="construction_site_num" property="constructionSiteNum" />
+        <result column="community_num" property="communityNum" />
+        <result column="other_num" property="otherNum" />
+    </resultMap>
+
+</mapper>