Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

101captain

2021-09-22 1775bb71f952106c58657cf02891cbe2a286c8f8

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java

@@ -1,16 +1,20 @@
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.model.vos.R;
import com.panzhihua.service_community.service.ComCvtBusinessService;
import com.panzhihua.service_community.service.ComCvtCategoryService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import java.util.List;

import javax.annotation.Resource;
import javax.validation.Valid;

import org.springframework.web.bind.annotation.*;

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.service_community.service.ComCvtBusinessService;
import com.panzhihua.service_community.service.ComCvtCategoryService;
import com.panzhihua.service_community.service.ComCvtServeService;

import lombok.extern.slf4j.Slf4j;

/**
 * @description: 便民服务接口
@@ -27,10 +31,15 @@

    @Resource
    private ComCvtCategoryService comCvtCategoryService;

    @Resource
    private ComCvtServeService comCvtServeService;

    /**
     * 社区后台分页查询便民服务商家
     *
     * @param pageComCvtBusinessDTO 查询参数
     * @param pageComCvtBusinessDTO
     *            查询参数
     * @return 返回结果
     */
    @PostMapping("/business/page")
@@ -39,20 +48,34 @@
    }

    /**
     * 小程序通过便民服务区域分页查询便民服务商家
     *
     * @param comCvtBusinessAppletsDTO
     *            查询参数
     * @return 返回结果
     */
    @PostMapping("/business/area/page")
    public R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
        return comCvtBusinessService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
    }

    /**
     * 新增便民服务商家
     *
     * @param comCvtBusinessDTO 商家参数
     * @param comCvtBusinessDTO
     *            商家参数
     * @return 返回结果
     */
    @PostMapping("/business/add")
    public R pageComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
    public R addComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
        return comCvtBusinessService.addComCvtBusiness(comCvtBusinessDTO);
    }

    /**
     * 编辑便民服务商家
     *
     * @param comCvtBusinessDTO 商家参数
     * @param comCvtBusinessDTO
     *            商家参数
     * @return 返回结果
     */
    @PutMapping("/business/put")
@@ -63,7 +86,8 @@
    /**
     * 查询便民服务商家详情
     *
     * @param id 商家主键
     * @param id
     *            商家主键
     * @return 返回结果
     */
    @GetMapping("/business/get")
@@ -74,7 +98,8 @@
    /**
     * 删除便民服务商家信息
     *
     * @param id 商家主键
     * @param id
     *            商家主键
     * @return 返回结果
     */
    @DeleteMapping("/business/delete")
@@ -82,11 +107,11 @@
        return comCvtBusinessService.deleteComCvtBusiness(id);
    }


    /**
     * 社区后台分页查询便民服务分类
     *
     * @param pageComCvtCategoryDTO 查询参数
     * @param pageComCvtCategoryDTO
     *            查询参数
     * @return 返回结果
     */
    @PostMapping("/category/page")
@@ -95,20 +120,32 @@
    }

    /**
     * 便民服务分类下拉,所有分类
     * 
     * @return 返回结果
     */
    @PostMapping("/category/all")
    public R allComCvtCategory() {
        return comCvtCategoryService.allComCvtCategory();
    }

    /**
     * 新增便民服务分类
     *
     * @param comCvtCategoryDTO 分类参数
     * @param comCvtCategoryDTO
     *            分类参数
     * @return 返回结果
     */
    @PostMapping("/category/add")
    public R pageComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
    public R addComCvtCategory(@Valid @RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
        return comCvtCategoryService.addComCvtCategory(comCvtCategoryDTO);
    }

    /**
     * 编辑便民服务分类
     *
     * @param comCvtCategoryDTO 分类参数
     * @param comCvtCategoryDTO
     *            分类参数
     * @return 返回结果
     */
    @PutMapping("/category/put")
@@ -119,7 +156,8 @@
    /**
     * 查询便民服务分类详情
     *
     * @param id 分类主键
     * @param id
     *            分类主键
     * @return 返回结果
     */
    @GetMapping("/category/get")
@@ -130,11 +168,96 @@
    /**
     * 删除便民服务分类信息
     *
     * @param 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(value = "communityId", required = false) Long communityId) {
        return comCvtServeService.listSaveConvenientServeExcelVO(list, communityId);
    }
}