Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoClassifyServiceImpl.java

@@ -1,5 +1,10 @@
package com.panzhihua.service_community.service.impl;

import java.util.Date;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,11 +14,8 @@
import com.panzhihua.service_community.dao.ComActEasyPhotoClassifyMapper;
import com.panzhihua.service_community.model.dos.ComActEasyPhotoClassifyDO;
import com.panzhihua.service_community.service.ComActEasyPhotoClassifyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import java.util.Date;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -22,16 +24,20 @@
 */
@Slf4j
@Service
public class ComActEasyPhotoClassifyServiceImpl extends ServiceImpl<ComActEasyPhotoClassifyMapper, ComActEasyPhotoClassifyDO> implements ComActEasyPhotoClassifyService {
public class ComActEasyPhotoClassifyServiceImpl extends
    ServiceImpl<ComActEasyPhotoClassifyMapper, ComActEasyPhotoClassifyDO> implements ComActEasyPhotoClassifyService {

    /**
     * 运营后台-新增随手拍分类
     * @param addPhotoClassify  请求参数
     * 
     * @param addPhotoClassify
     *            请求参数
     * @return  新增结果
     */
    @Override
    public R addPhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify){
        ComActEasyPhotoClassifyDO photoClassifyDO = this.baseMapper.selectOne(new QueryWrapper<ComActEasyPhotoClassifyDO>().lambda()
        ComActEasyPhotoClassifyDO photoClassifyDO =
            this.baseMapper.selectOne(new QueryWrapper<ComActEasyPhotoClassifyDO>().lambda()
                .eq(ComActEasyPhotoClassifyDO::getName,addPhotoClassify.getName()));
        if(photoClassifyDO != null){
            return R.fail("该随手拍分类已存在，请勿重复添加");
@@ -49,7 +55,9 @@

    /**
     * 运营后台-编辑随手拍分类
     * @param addPhotoClassify  请求参数
     * 
     * @param addPhotoClassify
     *            请求参数
     * @return  编辑结果
     */
    @Override
@@ -69,7 +77,9 @@

    /**
     * 运营后台-随手拍分类详情
     * @param id    随手拍分类id
     * 
     * @param id
     *            随手拍分类id
     * @return  随手拍分类
     */
    @Override
@@ -85,16 +95,20 @@

    /**
     * 运营后台-分页查询随手拍分类
     * @param addPhotoClassify  请求参数
     * 
     * @param addPhotoClassify
     *            请求参数
     * @return  随手拍分类列表
     */
    @Override
    public R pagePhotoClassify(AddEasyPhotoClassifyDTO addPhotoClassify){
        return R.ok(this.baseMapper.getPhotoClassifyPage(new Page(addPhotoClassify.getPageNum(),addPhotoClassify.getPageSize()),addPhotoClassify));
        return R.ok(this.baseMapper.getPhotoClassifyPage(
            new Page(addPhotoClassify.getPageNum(), addPhotoClassify.getPageSize()), addPhotoClassify));
    }

    /**
     * 运营后台-查询随手拍分类列表
     * 
     * @return  随手拍分类列表
     */
    @Override
@@ -104,7 +118,9 @@

    /**
     * 运营后台-随手拍分类删除
     * @param id    随手拍分类id
     * 
     * @param id
     *            随手拍分类id
     * @return  删除结果
     */
    @Override