From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期三, 03 十一月 2021 17:26:50 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java index 6eef90d..36c9a86 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.panzhihua.common.model.dtos.grid.*; +import com.panzhihua.common.model.dtos.grid.admin.EventGridMemberCascadeAddDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO; @@ -15,11 +16,12 @@ * @version 1.0 * @since 1.0 * @date 2021-05-26 - * */ + */ public interface EventGridMemberRelationService extends IService<EventGridMemberRelationDO> { /** * 新增网格和网格员的关联关系 + * * @param eventGridMemberAddDTO * @return 新增结果 */ @@ -27,6 +29,7 @@ /** * 修改网格和网格员的关联关系 + * * @param eventGridMemberEditDTO * @return 维护结果 */ @@ -34,6 +37,7 @@ /** * 分页查找网格和网格员的关联关系 + * * @param pageEventGridMemberRelationDTO * @return 维护结果 */ @@ -41,6 +45,7 @@ /** * 删除网格和网格员的关联关系 + * * @param EventGridMemberRelationDeleteDTO * @return 平台用户信息 */ @@ -48,19 +53,40 @@ /** * 查询网格和网格员的关联关系详细信息 - * @param id 网格和网格员的关联关系 id + * + * @param id + * 网格和网格员的关联关系 id * @return 查找结果 */ R<EventGridMemberRelationDetailsVO> eventGridMemberRelationDetails(Long id); /** * 根据网格员id查询关联网格列表 - * @param userId 网格员id - * @return 网格列表 + * + * @param userId + * 网格员id + * @return 网格列表 */ R getMapGridListByApp(Long userId); + /** + * 查询市平台网格员列表 + * + * @return 市平台网格员列表 + */ + R lcList(); + R gridMemberCascadeList(EventGridMemberCascadeAddDTO memberCascadeAddDTO); + R getMapGridListsByApp(EventGridCascadeListDTO cascadeListDTO); + + R getMapGridsListsByApp(Long userId); + + /** + * 查询社区网格员运动轨迹 + * @param communityId 社区id + * @return 社区网格员运动轨迹 + */ + R getGridsMemberTrajectory(Long communityId); } -- Gitblit v1.7.1