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

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

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -69,6 +70,16 @@ public class DemGridMemberController {
         return ApiResult.success(demGridMemberService.gridMemberScatter(gridArea, mapGridName, gridGrade, seniorGrid));
     }
 
+    /**
+     * 网格人员统计接口
+     *
+     * @return
+     */
+    @GetMapping("gridMemderViceStatistic")
+    public ApiResult<List<Map<String ,Object>>> gridMemderViceStatistic(){
+        return ApiResult.success(demGridMemberService.gridMemderViceStatistic());
+    }
+
     /**
      * 网格员信息管理-列表查询-导出
      *

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

@@ -7,6 +7,7 @@ import com.usky.common.mybatis.core.CrudService;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -22,6 +23,8 @@ public interface DemGridMemberService extends CrudService<DemGridMember> {
 
     List<DemGridMember> gridMemberScatter(String gridArea, String mapGridName, Integer gridGrade, Integer seniorGrid);
 
+    List<Map<String ,Object>> gridMemderViceStatistic();
+
     List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id);
 
     void addGridMember(DemGridMember demGridMember);

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

@@ -127,6 +127,16 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
         return list;
     }
 
+    @Override
+    public List<Map<String ,Object>> gridMemderViceStatistic(){
+        QueryWrapper<DemGridMemderVice> queryWrapper = Wrappers.query();
+        queryWrapper.select("personnel_type as personnelType","count(*) as count")
+                .groupBy("personnel_type");
+        List<Map<String,Object>> list = demGridMemderViceService.listMaps(queryWrapper);
+
+        return list;
+    }
+
     @Override
     public List<DemGridMemberVO> gridMemberListExport(String gridArea, String streetTown, String gridPersonnel, Integer id) {
         LambdaQueryWrapper<DemGridMember> queryWrapper = Wrappers.lambdaQuery();

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

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