From 3063550d2f07be58b33b54be93c3628806191b85 Mon Sep 17 00:00:00 2001 From: CeDo <cedoogle@gmail.com> Date: 星期五, 04 六月 2021 09:37:00 +0800 Subject: [PATCH] bugfixed:首页待处理事件统计信息 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 84 +++++++++++++++++++++++++++++++----------- 1 files changed, 62 insertions(+), 22 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java index 7511707..c013a8d 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java @@ -2,6 +2,7 @@ import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.*; +import com.panzhihua.common.model.vos.community.ComActVO; import com.panzhihua.common.model.vos.grid.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -16,21 +17,6 @@ @FeignClient(name = "grid") public interface GridService { - /** - * 新增事件 - * @param eventAddDTO - * @return 新增结果 - */ - @PostMapping("/event/add") - R add(@RequestBody EventAddDTO eventAddDTO); - - /** - * 修改事件 - * @param eventEditDTO - * @return 维护结果 - */ - @PostMapping("/event/edit") - R edit(@RequestBody EventEditDTO eventEditDTO); /** * 分页查找事件 @@ -58,19 +44,19 @@ /** * 新增网格和网格员的关联关系 - * @param eventGridMemberRelationAddDTO + * @param eventGridMemberAddDTO * @return 新增结果 */ @PostMapping("/eventgridmemberrelation/add") - R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO); + R add(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO); /** * 修改网格和网格员的关联关系 - * @param eventGridMemberRelationEditDTO + * @param eventGridMemberEditDTO * @return 维护结果 */ @PostMapping("/eventgridmemberrelation/edit") - R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO); + R edit(@RequestBody EventGridMemberEditDTO eventGridMemberEditDTO); /** * 分页查找网格和网格员的关联关系 @@ -519,11 +505,11 @@ /** * 网格数据待处理统计信息 - * @param pageEventGridDataDTO + * @param eventGridStatisticsDataDTO * @return */ - @PostMapping("/eventgriddata/getGridData") - R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO); + @PostMapping("/eventgriddata/getGridStatisticsdData") + R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO); /** * 查询用户网格 @@ -637,6 +623,13 @@ R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO); /** + * 分页查询社区列表 + * @return 结果 + */ + @PostMapping("/event/actList") + R actList(); + + /** * 地图模块-根据网格id查询网格详细信息 * @param gridId 网格id * @return 网格详细信息 @@ -659,4 +652,51 @@ */ @PostMapping("/map/getMapGridListByApp") R getMapGridListByApp(@RequestParam("userId") Long userId); + + /** + * 获取最新版本信息 + * @return 版本信息 + */ + @GetMapping("/eventapplicationapprelease/edition") + R editionUpdate(); + + /** + * 首页待处理 + * @param eventGridTodoDataDTO + * @return + */ + @PostMapping("/eventgriddata/getGridTodoData") + R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO); + + /** + * 后台获取网格员运动轨迹 + * @param workTrajectoryDTO 请求参数 + * @return 运动轨迹 + */ + @PostMapping("/map/gridMemberWorkTrajectory") + R gridMemberWorkTrajectory(@RequestBody EventGridMemberWorkTrajectoryDTO workTrajectoryDTO); + + /** + * 后台获取网格员预警记录 + * @param gridMemberWainDTO 请求参数 + * @return 预警记录 + */ + @PostMapping("/map/gridMemberWorkWarning") + R gridMemberWorkWarning(@RequestBody EventGridMemberWainDTO gridMemberWainDTO); + + /** + * 分页查询网格 + * @param eventGridDataDTO 请求参数 + * @return 网格列表 + */ + @PostMapping("/eventgriddata/data/list") + R getGridDataList(PageEventGridDataDTO eventGridDataDTO); + + /** + * 查询社区下所有网格员 + * @param communityId 社区id + * @return 网格员列表 + */ + @PostMapping("/eventgriddata/member/list") + R getGridMemberLists(@RequestParam("communityId") Long communityId); } -- Gitblit v1.7.1