Null
2021-03-12 d108c3fd9c50d23e03629776f13615d11504416d
便民服务后台接口
8个文件已修改
5个文件已添加
660 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java 101 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtServeDTO.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtServeDTO.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeVO.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtCategoryDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtServeDAO.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtCategoryService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtServeService.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtCategoryServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/CommunityConvenientApi.java
@@ -1,15 +1,13 @@
package com.panzhihua.applets_backstage.api;
import com.panzhihua.common.controller.BaseController;
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.dtos.community.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -55,36 +53,21 @@
    }
    /**
     * 编辑便民服务商家
     *
     * @param comCvtBusinessDTO 商家参数
     * @return 返回结果
     */
    @ApiOperation(value = "编辑便民服务商家")
    @PutMapping("/business/put")
    public R putComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
        return communityService.putComCvtBusiness(comCvtBusinessDTO);
    }
    /**
     * 查询便民服务商家详情
     *
     * @param id 商家主键
     * @return 返回结果
     */
    @ApiOperation(value = "查询便民服务商家详情")
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return communityService.getComCvtBusiness(id);
    }
    /**
     * 删除便民服务商家信息
     *
     * @param id 商家主键
     * @return 返回结果
     */
    @ApiOperation(value = "删除便民服务商家详情")
    @DeleteMapping("/business/delete")
    public R deleteComCvtBusiness(@RequestParam("id") Long id) {
@@ -92,63 +75,77 @@
    }
    /**
     * 运营后台分页查询便民服务分类
     *
     * @param pageComCvtCategoryDTO 查询参数
     * @return 返回结果
     */
    @ApiOperation(value = "分页查询便民服务分类",response = ComCvtCategoryVO.class)
    @PostMapping("/category/page")
    public R pageComCvtCategory(@RequestBody PageComCvtCategoryDTO pageComCvtCategoryDTO) {
        return communityService.pageComCvtCategory(pageComCvtCategoryDTO);
    }
    /**
     * 新增便民服务分类
     *
     * @param comCvtCategoryDTO 分类参数
     * @return 返回结果
     */
    @ApiOperation(value = "查询便民服务所有分类,下拉框",response = ComCvtCategoryVO.class)
    @PostMapping("/category/all")
    public R allComCvtCategory() {
        return communityService.allComCvtCategory();
    }
    @ApiOperation(value = "新增便民服务分类")
    @PostMapping("/category/add")
    public R pageComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
        return communityService.addComCvtCategory(comCvtCategoryDTO);
    }
    /**
     * 编辑便民服务分类
     *
     * @param comCvtCategoryDTO 分类参数
     * @return 返回结果
     */
    @ApiOperation(value = "编辑便民服务分类")
    @PutMapping("/category/put")
    public R putComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
        return communityService.putComCvtCategory(comCvtCategoryDTO);
    }
    /**
     * 查询便民服务分类详情
     *
     * @param id 分类主键
     * @return 返回结果
     */
    @ApiOperation(value = "查询便民服务分类详情",response = ComCvtCategoryVO.class)
    @GetMapping("/category/get")
    public R getComCvtCategory(@RequestParam("id") Long id) {
        return communityService.getComCvtCategory(id);
    }
    /**
     * 删除便民服务分类信息
     *
     * @param id 分类主键
     * @return 返回结果
     */
    @ApiOperation(value = "删除便民服务分类信息")
    @DeleteMapping("/category/delete")
    public R deleteComCvtCategory(@RequestParam("id") Long id) {
        return communityService.deleteComCvtCategory(id);
    }
    @ApiOperation(value = "分页查询便民服务",response = ComCvtServeVO.class)
    @PostMapping("/serve/page")
    public R pageComCvtServe(@RequestBody PageComCvtServeDTO pageComCvtServeDTO) {
        return communityService.pageComCvtServe(pageComCvtServeDTO);
    }
    @ApiOperation(value = "新增便民服务")
    @PostMapping("/serve/add")
    public R addComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        comCvtServeDTO.setCreateBy(userId);
        return communityService.addComCvtServe(comCvtServeDTO);
    }
    @ApiOperation(value = "编辑便民服务")
    @PutMapping("/serve/put")
    public R putComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO) {
        return communityService.putComCvtServe(comCvtServeDTO);
    }
    @ApiOperation(value = "查询便民服务详情",response = ComCvtServeVO.class)
    @GetMapping("/serve/get")
    public R getComCvtServe(@RequestParam("id") Long id) {
        return communityService.getComCvtServe(id);
    }
    @ApiOperation(value = "删除便民服务信息")
    @DeleteMapping("/serve/delete")
    public R deleteComCvtServe(@RequestParam("id") Long id) {
        return communityService.deleteComCvtServe(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComCvtServeDTO.java
New file
@@ -0,0 +1,54 @@
package com.panzhihua.common.model.dtos.community;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
 * @description: 便民服务新增/编辑参数
 * @author: Null
 * @date: 2021/3/11 10:52
 */
@Data
@ApiModel("便民服务新增/编辑参数")
public class ComCvtServeDTO implements Serializable {
    private static final long serialVersionUID = -7734682979200558948L;
    @ApiModelProperty("服务主键ID")
    private Long id;
    @ApiModelProperty("服务名称")
    @NotBlank(groups = {AddGroup.class},message = "服务名称不能为空")
    private String serviceName;
    @ApiModelProperty("服务价格")
    @NotBlank(groups = {AddGroup.class},message = "服务价格不能为空")
    private BigDecimal servicePrice;
    @ApiModelProperty("服务分类ID")
    @NotBlank(groups = {AddGroup.class},message = "服务分类不能为空")
    private Long categoryId;
    @ApiModelProperty("服务描述")
    @NotBlank(groups = {AddGroup.class},message = "服务描述不能为空")
    private String serviceDesc;
    @ApiModelProperty("所属商家ID")
    @NotBlank(groups = {AddGroup.class},message = "所属商家不能为空")
    private Long businessId;
    @ApiModelProperty("备注")
    private String remark;
    @ApiModelProperty(value = "创建人",hidden = true)
    private Long createBy;
    @ApiModelProperty(value ="创建时间",hidden = true)
    private Date createAt;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComCvtServeDTO.java
New file
@@ -0,0 +1,28 @@
package com.panzhihua.common.model.dtos.community;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * @description: 便民服务列表请求参数
 * @author: Null
 * @date: 2021/3/11 10:52
 */
@Data
@ApiModel("便民服务列表请求参数")
public class PageComCvtServeDTO {
    @ApiModelProperty("服务名称")
    private String serviceName;
    @ApiModelProperty(value = "分页-当前页数",example = "1")
    private Long pageNum;
    @ApiModelProperty(value = "分页-每页记录数",example = "10")
    private Long pageSize;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtServeVO.java
New file
@@ -0,0 +1,53 @@
package com.panzhihua.common.model.vos.community;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
 * @description: 便民服务列表
 * @author: Null
 * @date: 2021/3/11 10:52
 */
@Data
@ApiModel("便民服务")
public class ComCvtServeVO implements Serializable {
    private static final long serialVersionUID = -7734682979200558948L;
    @ApiModelProperty("服务主键ID")
    private Long id;
    @ApiModelProperty("服务名称")
    private String serviceName;
    @ApiModelProperty("服务价格")
    private BigDecimal servicePrice;
    @ApiModelProperty("服务分类ID")
    private Long categoryId;
    @ApiModelProperty("服务分类名称")
    private String categoryName;
    @ApiModelProperty("服务描述")
    private String serviceDesc;
    @ApiModelProperty("所属商家ID")
    private Long businessId;
    @ApiModelProperty("所属商家名称")
    private String businessName;
    @ApiModelProperty("备注")
    private String remark;
    @ApiModelProperty("创建人")
    private Long createBy;
    @ApiModelProperty("创建时间")
    private Date createAt;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -978,8 +978,17 @@
     * @param pageComCvtCategoryDTO 查询参数
     * @return 返回结果
     */
    @PostMapping("/category/page")
    @PostMapping("/convenient/category/page")
    R pageComCvtCategory(@RequestBody PageComCvtCategoryDTO pageComCvtCategoryDTO);
    /**
     * 社区后台分页查询便民服务分类
     *
     * @return 返回结果
     */
    @PostMapping("/convenient/category/all")
    R allComCvtCategory();
    /**
     * 新增便民服务分类
@@ -987,7 +996,7 @@
     * @param comCvtCategoryDTO 分类参数
     * @return 返回结果
     */
    @PostMapping("/category/add")
    @PostMapping("/convenient/category/add")
    R addComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO);
    /**
@@ -996,7 +1005,7 @@
     * @param comCvtCategoryDTO 分类参数
     * @return 返回结果
     */
    @PutMapping("/category/put")
    @PutMapping("/convenient/category/put")
    R putComCvtCategory(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO);
    /**
@@ -1005,7 +1014,7 @@
     * @param id 分类主键
     * @return 返回结果
     */
    @GetMapping("/category/get")
    @GetMapping("/convenient/category/get")
    R getComCvtCategory(@RequestParam("id") Long id);
    /**
@@ -1014,6 +1023,51 @@
     * @param id 分类主键
     * @return 返回结果
     */
    @DeleteMapping("/category/delete")
    @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);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
@@ -2,11 +2,15 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -37,7 +41,6 @@
        return communityService.pageComCvtBusiness(pageComCvtBusinessDTO);
    }
    @ApiOperation(value = "新增便民服务商家")
    @PostMapping("/business/add")
    public R addComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
@@ -56,39 +59,60 @@
    }
    /**
     * 编辑便民服务商家
     *
     * @param comCvtBusinessDTO 商家参数
     * @return 返回结果
     */
    @ApiOperation(value = "编辑便民服务商家")
    @PutMapping("/business/put")
    public R putComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
        return communityService.putComCvtBusiness(comCvtBusinessDTO);
    }
    /**
     * 查询便民服务商家详情
     *
     * @param id 商家主键
     * @return 返回结果
     */
    @ApiOperation(value = "查询便民服务商家详情")
    @GetMapping("/business/get")
    public R getComCvtBusiness(@RequestParam("id") Long id) {
        return communityService.getComCvtBusiness(id);
    }
    /**
     * 删除便民服务商家信息
     *
     * @param id 商家主键
     * @return 返回结果
     */
    @ApiOperation(value = "删除便民服务商家详情")
    @DeleteMapping("/business/delete")
    public R deleteComCvtBusiness(@RequestParam("id") Long id) {
        return communityService.deleteComCvtBusiness(id);
    }
    @ApiOperation(value = "分页查询便民服务",response = ComCvtServeVO.class)
    @PostMapping("/serve/page")
    public R pageComCvtServe(@RequestBody PageComCvtServeDTO pageComCvtServeDTO) {
        return communityService.pageComCvtServe(pageComCvtServeDTO);
    }
    @ApiOperation(value = "查询便民服务所有分类,下拉框",response = ComCvtCategoryVO.class)
    @PostMapping("/category/all")
    public R allComCvtCategory() {
        return communityService.allComCvtCategory();
    }
    @ApiOperation(value = "新增便民服务")
    @PostMapping("/serve/add")
    public R addComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
        comCvtServeDTO.setCreateBy(userId);
        return communityService.addComCvtServe(comCvtServeDTO);
    }
    @ApiOperation(value = "编辑便民服务")
    @PutMapping("/serve/put")
    public R putComCvtServe(@RequestBody ComCvtServeDTO comCvtServeDTO) {
        return communityService.putComCvtServe(comCvtServeDTO);
    }
    @ApiOperation(value = "查询便民服务详情",response = ComCvtServeVO.class)
    @GetMapping("/serve/get")
    public R getComCvtServe(@RequestParam("id") Long id) {
        return communityService.getComCvtServe(id);
    }
    @ApiOperation(value = "删除便民服务信息")
    @DeleteMapping("/serve/delete")
    public R deleteComCvtServe(@RequestParam("id") Long id) {
        return communityService.deleteComCvtServe(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -1,12 +1,10 @@
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.dtos.community.*;
import com.panzhihua.common.model.vos.R;
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;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +25,10 @@
    @Resource
    private ComCvtCategoryService comCvtCategoryService;
    @Resource
    private ComCvtServeService comCvtServeService;
    /**
     * 社区后台分页查询便民服务商家
     *
@@ -45,7 +47,7 @@
     * @return 返回结果
     */
    @PostMapping("/business/add")
    public R pageComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
    public R addComCvtBusiness(@RequestBody ComCvtBusinessDTO comCvtBusinessDTO) {
        return comCvtBusinessService.addComCvtBusiness(comCvtBusinessDTO);
    }
@@ -95,13 +97,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(@RequestBody ComCvtCategoryDTO comCvtCategoryDTO) {
        return comCvtCategoryService.addComCvtCategory(comCvtCategoryDTO);
    }
@@ -137,4 +148,59 @@
    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);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtCategoryDAO.java
@@ -23,7 +23,7 @@
            " and a.name LIKE concat( #{pageComCvtCategoryDTO.name}, '%' )  " +
            " </if> " +
            " </where>" +
            " order by a.create_at desc"+
            " order by a.weight desc"+
            "</script>")
    IPage<ComCvtCategoryVO> pageComCvtCategory(Page page, @Param("pageComCvtCategoryDTO") PageComCvtCategoryDTO pageComCvtCategoryDTO);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComCvtServeDAO.java
@@ -1,9 +1,41 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.service_community.model.dos.ComCvtServeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@Mapper
public interface ComCvtServeDAO extends BaseMapper<ComCvtServeDO> {
    @Select("<script> " +
            "SELECT " +
            " t.id , " +
            " t.service_name AS serviceName, " +
            " t.service_price AS servicePrice, " +
            " t.category_id AS categoryId, " +
            " t.service_desc AS serviceDesc, " +
            " t.business_id AS businessId, " +
            " t.remark, " +
            " t.create_by AS createBy, " +
            " t.create_at AS createAt, " +
            " t1.`name` AS businessName, " +
            " t2.`name` AS categoryName " +
            "FROM " +
            " com_cvt_serve t " +
            " LEFT JOIN com_cvt_business t1 ON t.business_id = t1.id " +
            " LEFT JOIN com_cvt_category t2 ON t.category_id= t2.id" +
            " <where>" +
            " <if test='pageComCvtServeDTO.serviceName != null and pageComCvtServeDTO.serviceName.trim() != &quot;&quot;'>" +
            " and t.service_name LIKE concat( #{pageComCvtServeDTO.serviceName}, '%' )  " +
            " </if> " +
            " </where>" +
            " ORDER BY t.create_at desc" +
            "</script>")
    IPage<ComCvtServeVO> pageComCvtServe(Page page, @Param(value = "pageComCvtServeDTO") PageComCvtServeDTO pageComCvtServeDTO);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtCategoryService.java
@@ -44,4 +44,10 @@
     * @return
     */
    R deleteComCvtCategory(Long id);
    /**
     * 查询便民服务所有分类
     * @return
     */
    R allComCvtCategory();
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComCvtServeService.java
New file
@@ -0,0 +1,47 @@
package com.panzhihua.service_community.service;
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.vos.R;
/**
 * @description: 社区 便民服务接口
 * @author: Null
 * @date: 2021/3/12 8:57
 */
public interface ComCvtServeService {
    /**
     * 分页查询便民服务
     * @param pageComCvtServeDTO 查询参数
     * @return 分页集合
     */
    R pageComCvtServe(PageComCvtServeDTO pageComCvtServeDTO);
    /**
     * 添加便民服务
     * @param comCvtServeDTO
     * @return
     */
    R addComCvtServe(ComCvtServeDTO comCvtServeDTO);
    /**
     * 编辑便民服务信息
     * @param comCvtServeDTO
     * @return
     */
    R putComCvtServe(ComCvtServeDTO comCvtServeDTO);
    /**
     * 查询便民服务详情
     * @return
     */
    R getComCvtServe(Long id);
    /**
     * 删除便民服务信息
     * @return
     */
    R deleteComCvtServe(Long id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtCategoryServiceImpl.java
@@ -6,14 +6,19 @@
import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.service_community.dao.ComCvtCategoryDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComCvtCategoryDO;
import com.panzhihua.service_community.service.ComCvtCategoryService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
 * @description:
@@ -49,6 +54,7 @@
        if(null!=comCvtCategoryDO){
            return R.fail("分类名称重复");
        }
        comCvtCategoryDO = new ComCvtCategoryDO();
        BeanUtils.copyProperties(comCvtCategoryDTO,comCvtCategoryDO);
        int count = comCvtCategoryDAO.insert(comCvtCategoryDO);
        if(count<1){
@@ -98,4 +104,18 @@
        }
        return R.ok();
    }
    @Override
    public R allComCvtCategory() {
        List<ComCvtCategoryVO> comCvtCategoryVOS = new ArrayList<>();
        List<ComCvtCategoryDO> categoryDOS = comCvtCategoryDAO.selectList(new QueryWrapper<ComCvtCategoryDO>().lambda().orderByDesc(ComCvtCategoryDO::getWeight));
        if (!ObjectUtils.isEmpty(categoryDOS)) {
            categoryDOS.forEach(categoryDO -> {
                ComCvtCategoryVO comCvtCategoryVO=new ComCvtCategoryVO();
                BeanUtils.copyProperties(categoryDO,comCvtCategoryVO);
                comCvtCategoryVOS.add(comCvtCategoryVO);
            });
        }
        return R.ok(comCvtCategoryVOS);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComCvtServeServiceImpl.java
New file
@@ -0,0 +1,113 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtCategoryVO;
import com.panzhihua.common.model.vos.community.ComCvtServeVO;
import com.panzhihua.service_community.dao.ComCvtBusinessDAO;
import com.panzhihua.service_community.dao.ComCvtCategoryDAO;
import com.panzhihua.service_community.dao.ComCvtServeDAO;
import com.panzhihua.service_community.model.dos.ComCvtBusinessDO;
import com.panzhihua.service_community.model.dos.ComCvtCategoryDO;
import com.panzhihua.service_community.model.dos.ComCvtServeDO;
import com.panzhihua.service_community.service.ComCvtServeService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * @description: 社区 便民服务接口实现类
 * @author: Null
 * @date: 2021/3/12 8:58
 */
@Service
public class ComCvtServeServiceImpl implements ComCvtServeService {
    @Resource
    private ComCvtServeDAO comCvtServeDAO;
    @Resource
    private ComCvtBusinessDAO comCvtBusinessDAO;
    @Resource
    private ComCvtCategoryDAO comCvtCategoryDAO;
    @Override
    public R pageComCvtServe(PageComCvtServeDTO pageComCvtServeDTO) {
        Page page = new Page<>();
        Long pageNum = pageComCvtServeDTO.getPageNum();
        Long pageSize = pageComCvtServeDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComCvtServeVO> iPage = comCvtServeDAO.pageComCvtServe(page, pageComCvtServeDTO);
        return R.ok(iPage);
    }
    @Override
    public R addComCvtServe(ComCvtServeDTO comCvtServeDTO) {
        ComCvtServeDO comCvtServeDO = new ComCvtServeDO();
        BeanUtils.copyProperties(comCvtServeDTO,comCvtServeDO);
        int insert = comCvtServeDAO.insert(comCvtServeDO);
        if(insert>0){
            return R.ok();
        }
        return R.fail();
    }
    @Override
    public R putComCvtServe(ComCvtServeDTO comCvtServeDTO) {
        ComCvtServeDO comCvtServeDO = comCvtServeDAO.selectById(comCvtServeDTO.getId());
        if(null==comCvtServeDO){
            return R.fail("该服务不存在");
        }
        BeanUtils.copyProperties(comCvtServeDTO,comCvtServeDO);
        int update = comCvtServeDAO.updateById(comCvtServeDO);
        if(update>0){
            return R.ok();
        }
        return R.fail();
    }
    @Override
    public R getComCvtServe(Long id) {
        ComCvtServeDO comCvtServeDO = comCvtServeDAO.selectById(id);
        if(null==comCvtServeDO){
            return R.fail("该服务不存在");
        }
        ComCvtServeVO comCvtServeVO = new ComCvtServeVO();
        BeanUtils.copyProperties(comCvtServeDO,comCvtServeVO);
        ComCvtBusinessDO comCvtBusinessDO = comCvtBusinessDAO.selectById(comCvtServeDO.getBusinessId());
        if(null!=comCvtBusinessDO){
            comCvtServeVO.setBusinessName(comCvtBusinessDO.getName());
        }
        ComCvtCategoryDO comCvtCategoryDO = comCvtCategoryDAO.selectById(comCvtServeDO.getCategoryId());
        if(null!=comCvtCategoryDO){
            comCvtServeVO.setCategoryName(comCvtCategoryDO.getName());
        }
        return R.ok(comCvtServeDO);
    }
    @Override
    public R deleteComCvtServe(Long id) {
        ComCvtServeDO comCvtServeDO = comCvtServeDAO.selectById(id);
        if(null==comCvtServeDO){
            return R.fail("该服务不存在");
        }
        int count = comCvtServeDAO.deleteById(id);
        if(count<1){
            return R.fail("删除失败");
        }
        return R.ok();
    }
}