springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridCascadeVO.java
New file @@ -0,0 +1,25 @@ package com.panzhihua.common.model.vos.grid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /** * 地图模块-网格员绑定的网格信息 */ @Data @ApiModel("地图模块-网格员绑定的网格信息") public class EventMapGridCascadeVO { @ApiModelProperty("网格id") private Long gridId; @ApiModelProperty("网格名字") private String gridName; @ApiModelProperty("社区下网格列表") private List<EventMapGridCascadeVO> childList; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1232,4 +1232,12 @@ */ @PostMapping("/map/getMapGridListsByApp") R getMapGridListsByApp(@RequestBody EventGridCascadeListDTO cascadeListDTO); /** * 首页查询网格级联列表2 * @param userId 用户id * @return 网格列表 */ @PostMapping("/map/getMapGridsListsByApp") R getMapGridsListsByApp(@RequestParam("userId") Long userId); } springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/MapApi.java
@@ -5,6 +5,7 @@ import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.ComMapGridDetailVO; import com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO; import com.panzhihua.common.model.vos.grid.EventMapGridVO; import com.panzhihua.common.model.vos.grid.EventMapTrajectoryVO; import com.panzhihua.common.service.grid.GridService; @@ -68,4 +69,14 @@ return gridService.getMapGridListsByApp(cascadeListDTO); } @ApiOperation(value = "查询网格员关联网格列表级联2-lyq",response = EventMapGridCascadeVO.class) @PostMapping("getGridLists") public R getGridsLists(){ LoginUserInfoVO userInfoVO = this.getLoginUserInfo(); if(userInfoVO == null || userInfoVO.getUserId() == null){ return R.fail("请先登录"); } return gridService.getMapGridsListsByApp(userInfoVO.getUserId()); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/MapApi.java
@@ -89,4 +89,9 @@ return eventGridMemberRelationService.getMapGridListsByApp(cascadeListDTO); } @PostMapping("getMapGridsListsByApp") public R getMapGridsListsByApp(@RequestParam("userId") Long userId){ return eventGridMemberRelationService.getMapGridsListsByApp(userId); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java
@@ -7,6 +7,7 @@ import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO; import com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO; import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO; import com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO; import com.panzhihua.common.model.vos.grid.EventMapGridVO; import com.panzhihua.common.model.vos.grid.EventStatisticsMemberAdminVO; import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO; @@ -65,4 +66,6 @@ List<EventMapGridVO> getMapGridListsByApp(@Param("cascadeListDTO") EventGridCascadeListDTO cascadeListDTO); List<EventMapGridCascadeVO> getMapGridsListsByApp(@Param("userId") Long userId, @Param("type") Integer type, @Param("communityId") Long communityId); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
@@ -71,6 +71,8 @@ R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO); R getMapGridsListsByApp(Long userId);
@@ -8,6 +8,7 @@ import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO; import com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO; import com.panzhihua.common.model.vos.grid.EventMapGridVO; import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO; import com.panzhihua.common.service.user.UserService; @@ -166,4 +167,20 @@ return R.ok(eventGridMemberRelationMapper.getMapGridListsByApp(cascadeListDTO)); } @Override public R getMapGridsListsByApp(Long userId){ List<EventMapGridCascadeVO> resultList = new ArrayList<>(); List<EventMapGridCascadeVO> list = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,1,null); if(!list.isEmpty()){ list.forEach(gridCascadeVO -> { List<EventMapGridCascadeVO> childList = this.eventGridMemberRelationMapper.getMapGridsListsByApp(userId,2,gridCascadeVO.getGridId()); if(!childList.isEmpty()){ gridCascadeVO.setChildList(childList); resultList.add(gridCascadeVO); } }); } return R.ok(resultList); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml
@@ -360,4 +360,21 @@ </select> <select id="getMapGridsListsByApp" resultType="com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO"> <if test="type != null and type == 1"> SELECT DISTINCT egmr.grid_community_id as gridId, ca.`name` AS gridName FROM event_grid_member_relation AS egmr LEFT JOIN com_act AS ca ON ca.community_id = egmr.grid_community_id WHERE grid_member_id = #{userId} </if> <if test="type != null and type == 2"> select id as gridId,grid_name AS gridName from event_grid_member_relation as egmr where grid_member_id = #{userId} and grid_community_id = #{communityId} </if> </select> </mapper>
