From 8b13ca9086a609ef3bae76dab15faba55123d2dd Mon Sep 17 00:00:00 2001 From: Null <281575458@qq.com> Date: 星期三, 17 三月 2021 09:17:47 +0800 Subject: [PATCH] 处理合并代码问题 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 86 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java index 7317e3b..6a61ccb 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java @@ -11,6 +11,8 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 社区 @@ -928,6 +930,49 @@ R detailMessage(@RequestParam("id")Long id); /** + * 小程序通过便民服务区域分页查询便民服务商家 + * @param comCvtBusinessAppletsDTO 查询参数 + * @return 返回结果 + */ + @PostMapping("/convenient/business/area/page") + R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO); + + /** + * 一起议-新增 + * @param comOpsHouseDTO 新增参数 + * @return 新增结果 + */ + @PostMapping("addOpsHouse") + R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO); + + /** + * 一起议-详情 + * @param id 主键 + * @return ComOpsHouseVO + */ + @PostMapping("detailOpsHouse") + R detailOpsHouse(@RequestParam("id") Long id); + + @PostMapping("/putOpsHouse") + R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO); + + /** + * 一起议-删除 + * @param id 主键 + * @return 删除结果 + */ + @PostMapping("deleteOpsHouse") + R deleteOpsHouse(@RequestParam("id") Long id); + + /** + * 一起议-分页查询 + * @param pageComOpsHouseDTO 查询参数 + * @return ComOpsHouseVO + */ + @PostMapping("pageOpsHouse") + R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO); + + /** * 社区后台分页查询便民服务商家 * @param pageComCvtBusinessDTO 查询参数 * @return 返回结果 @@ -1070,4 +1115,45 @@ */ @DeleteMapping("/convenient/serve/delete") R deleteComCvtServe(@RequestParam("id") Long id); + + + /** + * 小程序便民服务商家详情 + * @param id 商家ID + * @return + */ + @GetMapping("/convenient/business/serve/get") + R getComCvtBusinessServeDetail(@RequestParam("id")Long id); + + /** + * 批量导入便民服务 + * @param list 便民服务集合 + */ + @PostMapping("/convenient/serve/import") + R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,@RequestParam("communityId") Long communityId); + + /** + * 导出房屋信息 + * @param areaId + * @return + */ + @PostMapping("/house/export") + R houseExport(@RequestParam("areaId") Long areaId); + + /** + * 小程序添加车辆信息 + * @param comCvtBusinessDTO + * @return + */ + @PostMapping("/common/data/car/user/register") + R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comCvtBusinessDTO); + + /** + * 小程序用户登记车辆列表 + * @param userId + * @return + */ + @GetMapping("/common/data/car/user/list") + R userComMngCarList(@RequestParam("userId") Long userId); + } -- Gitblit v1.7.1