From 34fcf32a24d06befd53c6e05ae9c41a4de24e71b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 15 七月 2021 10:00:00 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 109 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
index d48b7fc..b335f3b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -1,16 +1,21 @@
package com.panzhihua.service_community.api;
-import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
-import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
-import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
+import com.panzhihua.common.exceptions.PartyBuildingMemberException;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
+import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberExcelVO;
import com.panzhihua.service_community.service.ComCvtBusinessService;
import com.panzhihua.service_community.service.ComCvtCategoryService;
+import com.panzhihua.service_community.service.ComCvtServeService;
+import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
/**
* @description: 便民服务接口
@@ -27,6 +32,10 @@
@Resource
private ComCvtCategoryService comCvtCategoryService;
+
+ @Resource
+ private ComCvtServeService comCvtServeService;
+
/**
* 社区后台分页查询便民服务商家
*
@@ -39,13 +48,24 @@
}
/**
+ * 小程序通过便民服务区域分页查询便民服务商家
+ *
+ * @param comCvtBusinessAppletsDTO 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/business/area/page")
+ public R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
+ return comCvtBusinessService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
+ }
+
+ /**
* 新增便民服务商家
*
* @param comCvtBusinessDTO 商家参数
* @return 返回结果
*/
@PostMapping("/business/add")
- public R pageComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
+ public R addComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
return comCvtBusinessService.addComCvtBusiness(comCvtBusinessDTO);
}
@@ -95,13 +115,22 @@
}
/**
+ * 便民服务分类下拉,所有分类
+ * @return 返回结果
+ */
+ @PostMapping("/category/all")
+ public R allComCvtCategory() {
+ return comCvtCategoryService.allComCvtCategory();
+ }
+
+ /**
* 新增便民服务分类
*
* @param comCvtCategoryDTO 分类参数
* @return 返回结果
*/
@PostMapping("/category/add")
- public R pageComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
+ public R addComCvtCategory(@Valid @RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
return comCvtCategoryService.addComCvtCategory(comCvtCategoryDTO);
}
@@ -137,4 +166,78 @@
public R deleteComCvtCategory(@RequestParam("id") Long id) {
return comCvtCategoryService.deleteComCvtCategory(id);
}
+
+ /**
+ * 社区后台分页查询便民服务
+ *
+ * @param pageComCvtServeDTO 查询参数
+ * @return 返回结果
+ */
+ @PostMapping("/serve/page")
+ public R pageComCvtServe(@RequestBody PageComCvtServeDTO pageComCvtServeDTO) {
+ return comCvtServeService.pageComCvtServe(pageComCvtServeDTO);
+ }
+
+ /**
+ * 新增便民服务
+ *
+ * @param comCvtServeDTO 参数
+ * @return 返回结果
+ */
+ @PostMapping("/serve/add")
+ public R addComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO) {
+ return comCvtServeService.addComCvtServe(comCvtServeDTO);
+ }
+
+ /**
+ * 编辑便民服务
+ *
+ * @param comCvtServeDTO 分类参数
+ * @return 返回结果
+ */
+ @PutMapping("/serve/put")
+ public R putComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO) {
+ return comCvtServeService.putComCvtServe(comCvtServeDTO);
+ }
+
+ /**
+ * 查询便民服务详情
+ *
+ * @param id 服务主键
+ * @return 返回结果
+ */
+ @GetMapping("/serve/get")
+ public R getComCvtServe(@RequestParam("id") Long id) {
+ return comCvtServeService.getComCvtServe(id);
+ }
+
+ /**
+ * 删除便民服务信息
+ *
+ * @param id 服务主键
+ * @return 返回结果
+ */
+ @DeleteMapping("/serve/delete")
+ public R deleteComCvtServe(@RequestParam("id") Long id) {
+ return comCvtServeService.deleteComCvtServe(id);
+ }
+
+ /**
+ * 小程序便民服务商家详情
+ * @param id 商家ID
+ * @return
+ */
+ @GetMapping("/business/serve/get")
+ public R getComCvtBusinessServeDetail(@RequestParam("id")Long id){
+ return comCvtBusinessService.getComCvtBusinessServeDetail(id);
+ };
+
+ /**
+ * 批量新增商家服务
+ * @param list 服务集合
+ */
+ @PostMapping("/serve/import")
+ public R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,@RequestParam(value = "communityId",required = false) Long communityId){
+ return comCvtServeService.listSaveConvenientServeExcelVO(list,communityId);
+ }
}
--
Gitblit v1.7.1