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/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java |  241 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 241 insertions(+), 0 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
new file mode 100644
index 0000000..745830e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -0,0 +1,241 @@
+package com.panzhihua.service_community.api;
+
+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.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @description: 便民服务接口
+ * @author: Null
+ * @date: 2021/3/11 13:19
+ */
+@Slf4j
+@RestController
+@RequestMapping("/convenient")
+public class ConvenientApi {
+
+    @Resource
+    private ComCvtBusinessService comCvtBusinessService;
+
+    @Resource
+    private ComCvtCategoryService comCvtCategoryService;
+
+    @Resource
+    private ComCvtServeService comCvtServeService;
+
+    /**
+     * 社区后台分页查询便民服务商家
+     *
+     * @param pageComCvtBusinessDTO 查询参数
+     * @return 返回结果
+     */
+    @PostMapping("/business/page")
+    public R pageComCvtBusiness(@RequestBody PageComCvtBusinessDTO pageComCvtBusinessDTO) {
+        return comCvtBusinessService.pageComCvtBusiness(pageComCvtBusinessDTO);
+    }
+
+    /**
+     * 小程序通过便民服务区域分页查询便民服务商家
+     *
+     * @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 addComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
+        return comCvtBusinessService.addComCvtBusiness(comCvtBusinessDTO);
+    }
+
+    /**
+     * 编辑便民服务商家
+     *
+     * @param comCvtBusinessDTO 商家参数
+     * @return 返回结果
+     */
+    @PutMapping("/business/put")
+    public R putComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
+        return comCvtBusinessService.putComCvtBusiness(comCvtBusinessDTO);
+    }
+
+    /**
+     * 查询便民服务商家详情
+     *
+     * @param id 商家主键
+     * @return 返回结果
+     */
+    @GetMapping("/business/get")
+    public R getComCvtBusiness(@RequestParam("id") Long id) {
+        return comCvtBusinessService.getComCvtBusiness(id);
+    }
+
+    /**
+     * 删除便民服务商家信息
+     *
+     * @param id 商家主键
+     * @return 返回结果
+     */
+    @DeleteMapping("/business/delete")
+    public R deleteComCvtBusiness(@RequestParam("id") Long id) {
+        return comCvtBusinessService.deleteComCvtBusiness(id);
+    }
+
+
+    /**
+     * 社区后台分页查询便民服务分类
+     *
+     * @param pageComCvtCategoryDTO 查询参数
+     * @return 返回结果
+     */
+    @PostMapping("/category/page")
+    public R pageComCvtCategory(@RequestBody PageComCvtCategoryDTO pageComCvtCategoryDTO) {
+        return comCvtCategoryService.pageComCvtCategory(pageComCvtCategoryDTO);
+    }
+
+    /**
+     * 便民服务分类下拉,所有分类
+     * @return 返回结果
+     */
+    @PostMapping("/category/all")
+    public R allComCvtCategory() {
+        return comCvtCategoryService.allComCvtCategory();
+    }
+
+    /**
+     * 新增便民服务分类
+     *
+     * @param comCvtCategoryDTO 分类参数
+     * @return 返回结果
+     */
+    @PostMapping("/category/add")
+    public R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
+        return comCvtCategoryService.addComCvtCategory(comCvtCategoryDTO);
+    }
+
+    /**
+     * 编辑便民服务分类
+     *
+     * @param comCvtCategoryDTO 分类参数
+     * @return 返回结果
+     */
+    @PutMapping("/category/put")
+    public R putComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
+        return comCvtCategoryService.putComCvtCategory(comCvtCategoryDTO);
+    }
+
+    /**
+     * 查询便民服务分类详情
+     *
+     * @param id 分类主键
+     * @return 返回结果
+     */
+    @GetMapping("/category/get")
+    public R getComCvtCategory(@RequestParam("id") Long id) {
+        return comCvtCategoryService.getComCvtCategory(id);
+    }
+
+    /**
+     * 删除便民服务分类信息
+     *
+     * @param id 分类主键
+     * @return 返回结果
+     */
+    @DeleteMapping("/category/delete")
+    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("communityId") Long communityId){
+        return comCvtServeService.listSaveConvenientServeExcelVO(list,communityId);
+    }
+}

--
Gitblit v1.7.1