From 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d Mon Sep 17 00:00:00 2001
From: hhhyyq <hhhyyq@163.com>
Date: 星期三, 17 三月 2021 00:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 257 insertions(+), 3 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 710b365..c1de668 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
@@ -9,9 +9,9 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -865,7 +865,77 @@
*/
@PostMapping("checkAreaHouse")
R checkAreaHouse(@RequestParam("id")Long id);
+ /**
+ * 新增留言
+ * @param comActMessageVO 新增留言信息
+ * @return 发布结果
+ */
+ @PostMapping("addmessage")
+ R addMessage(@RequestBody ComActMessageVO comActMessageVO);
+ /**
+ * 我的留言
+ * @param comActMessageVO 留言信息
+ * @return 发布结果
+ */
+ @PostMapping("pagemymessage")
+ R pageMyMessageApplets(@RequestBody ComActMessageVO comActMessageVO);
+ /**
+ * 给我的留言
+ * @param comActMessageVO 留言信息
+ * @return 发布结果
+ */
+ @PostMapping("pagesendtomemessage")
+ R pageSendToMessageApplets(@RequestBody ComActMessageVO comActMessageVO);
+ /**
+ * 新增留言回复
+ * @param comActMessageBackVO 保存留言回复信息
+ * @return 发布结果
+ */
+ @PostMapping("addmessageback")
+ R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO);
+ /**
+ * 根据id查询留言列表
+ * @param id 用户id
+ * @return 发布结果
+ */
+ @PostMapping("pagemessagebyuser")
+ R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO);
+ /**
+ * 根据id删除留言
+ * @param id id
+ * @return 删除结果
+ */
+ @PostMapping("deletemessage")
+ R deleteMessage(@RequestBody ComActMessageVO comActMessageVO);
+ /**
+ * 根据id集合批量设置是否公开
+ * @param ids id集合
+ * @return 删除结果
+ */
+ @PostMapping("resetmessagepublic")
+ R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO);
+ /**
+ * 分页显示社区所有留言
+ * @param comActMessageVO 留言信息
+ * @return 结果集合
+ */
+ @PostMapping("pagemycommunitymessage")
+ R pageMyCommunityMessage(@RequestBody ComActMessageVO comActMessageVO);
+ /**
+ * 根据id查找留言详情
+ * @param id
+ * @return
+ */
+ @PostMapping("detailmessage")
+ R detailMessage(@RequestParam("id")Long id);
+ /**
+ * 小程序通过便民服务区域分页查询便民服务商家
+ * @param comCvtBusinessAppletsDTO 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/business/area/page")
+ R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);
/**
* 一起议-新增
@@ -902,4 +972,188 @@
@PostMapping("pageOpsHouse")
R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO);
+ /**
+ * 社区后台分页查询便民服务商家
+ * @param pageComCvtBusinessDTO 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/business/page")
+ R pageComCvtBusiness(@RequestBody PageComCvtBusinessDTO pageComCvtBusinessDTO);
+
+ /**
+ * 添加便民服务商家信息
+ * @param comCvtBusinessDTO
+ * @return
+ */
+ @PostMapping("/convenient/business/add")
+ R addComCvtBusiness(ComCvtBusinessDTO comCvtBusinessDTO);
+
+
+ /**
+ * 编辑便民服务商家
+ *
+ * @param comCvtBusinessDTO 商家参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/business/put")
+ R putComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO);
+
+ /**
+ * 查询便民服务商家详情
+ *
+ * @param id 商家主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/business/get")
+ R getComCvtBusiness(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务商家信息
+ *
+ * @param id 商家主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/convenient/business/delete")
+ R deleteComCvtBusiness(@RequestParam("id") Long id);
+
+
+ /**
+ * 社区后台分页查询便民服务分类
+ *
+ * @param pageComCvtCategoryDTO 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/page")
+ R pageComCvtCategory(@RequestBody PageComCvtCategoryDTO pageComCvtCategoryDTO);
+
+
+ /**
+ * 社区后台分页查询便民服务分类
+ *
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/all")
+ R allComCvtCategory();
+
+ /**
+ * 新增便民服务分类
+ *
+ * @param comCvtCategoryDTO 分类参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/category/add")
+ R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO);
+
+ /**
+ * 编辑便民服务分类
+ *
+ * @param comCvtCategoryDTO 分类参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/category/put")
+ R putComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO);
+
+ /**
+ * 查询便民服务分类详情
+ *
+ * @param id 分类主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/category/get")
+ R getComCvtCategory(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务分类信息
+ *
+ * @param id 分类主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/convenient/category/delete")
+ R deleteComCvtCategory(@RequestParam("id") Long id);
+
+ /**
+ * 社区后台分页查询便民服务
+ *
+ * @param pageComCvtServeDTO 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/serve/page")
+ R pageComCvtServe(@RequestBody PageComCvtServeDTO pageComCvtServeDTO);
+
+ /**
+ * 新增便民服务
+ *
+ * @param comCvtServeDTO 参数
+ * @return 返回结果
+ */
+ @PostMapping("/convenient/serve/add")
+ R addComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO);
+
+ /**
+ * 编辑便民服务
+ *
+ * @param comCvtServeDTO 分类参数
+ * @return 返回结果
+ */
+ @PutMapping("/convenient/serve/put")
+ R putComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO);
+
+ /**
+ * 查询便民服务详情
+ *
+ * @param id 服务主键
+ * @return 返回结果
+ */
+ @GetMapping("/convenient/serve/get")
+ R getComCvtServe(@RequestParam("id") Long id);
+
+ /**
+ * 删除便民服务信息
+ *
+ * @param id 服务主键
+ * @return 返回结果
+ */
+ @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);
+>>>>>>> origin/master
}
--
Gitblit v1.7.1