From 2e69d6f6be27f8be68313e4c544548fb47eba731 Mon Sep 17 00:00:00 2001 From: CeDo <cedoogle@gmail.com> Date: 星期二, 01 六月 2021 10:19:45 +0800 Subject: [PATCH] update --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 88 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 68 insertions(+), 20 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 7e36951..53bc686 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); /** * 分页查找网格和网格员的关联关系 @@ -546,7 +532,7 @@ * @param idCard * @return */ - @PostMapping("/event/addSpecial") + @PostMapping("/event/getSpecialPopulation") R getSpecialPopulation(String idCard); /** @@ -611,4 +597,66 @@ */ @PostMapping("/easy/report") R easyReport(@RequestBody ComActEasyPhotoHandleDTO photoHandleDTO); + + /** + * 添加发布宣传教育事件 + * @param publicityEventAddDTO 请求参数 + * @return 添加发布结果 + */ + @PostMapping("/event/addPublicity") + R addPublicity(@RequestBody PublicityEventAddDTO publicityEventAddDTO); + + /** + * 保存宣传教育事件草稿 + * @param publicityEventEditDTO 请求参数 + * @return 保存结果 + */ + @PostMapping("/event/savePublicityDraft") + R savePublicityDraft(@RequestBody PublicityEventEditDTO publicityEventEditDTO); + + /** + * 分页查询宣传教育事件 + * @param pagePublicityEventDTO 请求参数 + * @return 结果 + */ + @PostMapping("/event/queryPublicity") + R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO); + + /** + * 分页查询社区列表 + * @return 结果 + */ + @PostMapping("/event/actList") + R actList(); + + /** + * 地图模块-根据网格id查询网格详细信息 + * @param gridId 网格id + * @return 网格详细信息 + */ + @PostMapping("/map/getGridDetail") + R getGridDetail(@RequestParam("gridId") Long gridId); + + /** + * 地图模块-根据网格员id查询今日运动轨迹 + * @param userId 网格员id + * @return 运动轨迹 + */ + @PostMapping("/map/getTrajectoryByApp") + R getTrajectoryByApp(@RequestParam("userId") Long userId); + + /** + * 地图模块-根据网格员id查询关联网格列表 + * @param userId 网格员id + * @return 网格列表 + */ + @PostMapping("/map/getMapGridListByApp") + R getMapGridListByApp(@RequestParam("userId") Long userId); + + /** + * 获取最新版本信息 + * @return 版本信息 + */ + @GetMapping("/eventapplicationapprelease/edition") + R editionUpdate(); } -- Gitblit v1.7.1