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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/ComActEasyPhotoServiceImpl.java

@@ -1,5 +1,15 @@
package com.panzhihua.service_grid.service.impl;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,19 +19,14 @@
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoAdminVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoDetailsVO;
import com.panzhihua.common.model.vos.grid.ComActEasyPhotoVO;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.dao.ComActEasyPhotoMapper;
import com.panzhihua.service_grid.dao.ComActEasyPhotoTypeRelationMapper;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoDO;
import com.panzhihua.service_grid.model.dos.ComActEasyPhotoTypeRelationDO;
import com.panzhihua.service_grid.service.ComActEasyPhotoService;
import com.panzhihua.service_grid.service.ComActEasyPhotoTypeRelationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -30,7 +35,8 @@
 */
@Slf4j
@Service
public class ComActEasyPhotoServiceImpl extends ServiceImpl<ComActEasyPhotoMapper, ComActEasyPhotoDO> implements ComActEasyPhotoService {
public class ComActEasyPhotoServiceImpl extends ServiceImpl<ComActEasyPhotoMapper, ComActEasyPhotoDO>
    implements ComActEasyPhotoService {

    @Resource
    private ComActEasyPhotoMapper comActEasyPhotoMapper;
@@ -38,8 +44,10 @@
    private ComActEasyPhotoTypeRelationMapper comActEasyPhotoTypeRelationMapper;
    @Resource
    private ComActEasyPhotoTypeRelationService comActEasyPhotoTypeRelationService;

    /**
     * 新增社区活动 》随手拍
     * 
     * @param comActEasyPhotoAddDTO
     * @return 新增结果
     */
@@ -55,6 +63,7 @@

    /**
     * 修改社区活动 》随手拍
     * 
     * @param comActEasyPhotoEditDTO
     * @return 维护结果
     */
@@ -70,6 +79,7 @@

    /**
     * 分页查找社区活动 》随手拍
     * 
     * @param easyAppDTO
     * @return 维护结果
     */
@@ -98,6 +108,7 @@

    /**
     * 删除社区活动 》随手拍
     * 
     * @param ComActEasyPhotoDeleteDTO
     * @return 平台用户信息
     */
@@ -107,7 +118,9 @@

    /**
     * 查询社区活动 》随手拍详细信息
     * @param id 社区活动 》随手拍 id
     * 
     * @param id
     *            社区活动 》随手拍 id
     * @return 查找结果
     */
    public R<ComActEasyPhotoDetailsVO> comActEasyPhotoDetails(Long id){
@@ -122,7 +135,9 @@

    /**
     * 根据随手拍id查询随手拍详情
     * @param easyId    随手拍id
     * 
     * @param easyId
     *            随手拍id
     * @return  随手拍详情
     */
    @Override
@@ -140,7 +155,9 @@

    /**
     * 随手拍处理
     * @param photoHandleDTO    请求参数
     * 
     * @param photoHandleDTO
     *            请求参数
     * @return  处理结果
     */
    @Override
@@ -177,7 +194,9 @@

    /**
     * 随手拍公示状态切换
     * @param photoHandleDTO    请求参数
     * 
     * @param photoHandleDTO
     *            请求参数
     * @return  切换结果
     */
    @Override
@@ -197,7 +216,9 @@

    /**
     * 随手拍上报社区
     * @param photoHandleDTO    请求参数
     * 
     * @param photoHandleDTO
     *            请求参数
     * @return  上报结果
     */
    @Override
@@ -219,16 +240,20 @@

    /**
     * 后台管理-分页查询随手拍列表
     * @param easyAppDTO    请求参数
     * 
     * @param easyAppDTO
     *            请求参数
     * @return  随手拍列表
     */
    @Override
    public R easyListByAdmin(PageEasyAdminDTO easyAppDTO){
        IPage<ComActEasyPhotoAdminVO> photoAdminVOIPage = this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(),easyAppDTO.getPageSize()), easyAppDTO);
        IPage<ComActEasyPhotoAdminVO> photoAdminVOIPage =
            this.baseMapper.easyListByAdmin(new Page(easyAppDTO.getPageNum(), easyAppDTO.getPageSize()), easyAppDTO);
        if(!photoAdminVOIPage.getRecords().isEmpty()){
            photoAdminVOIPage.getRecords().forEach(photoAdmin -> {
                //随手拍已处理，查询随手拍类型
                List<String> photoTypeList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(photoAdmin.getId());
                List<String> photoTypeList =
                    comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(photoAdmin.getId());
                if(!photoTypeList.isEmpty()){
                    photoAdmin.setPhotoTypeList(photoTypeList);
                }
@@ -239,7 +264,9 @@

    /**
     * 后台管理-随手拍详情
     * @param easyId    随手拍id
     * 
     * @param easyId
     *            随手拍id
     * @return  随手拍详情
     */
    @Override
@@ -250,7 +277,8 @@
        }
        if(photoAdminVO.getHandleStatus().equals(ComActEasyPhotoDO.handleStatus.yes)){
            //随手拍已处理，查询随手拍类型
            List<String> photoTypeList = comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(photoAdminVO.getId());
            List<String> photoTypeList =
                comActEasyPhotoTypeRelationMapper.getEasyPhotoTypeRelationByEasyId(photoAdminVO.getId());
            if(!photoTypeList.isEmpty()){
                photoAdminVO.setPhotoTypeList(photoTypeList);
            }
@@ -260,7 +288,9 @@

    /**
     * 后台管理-随手拍处理
     * @param photoHandleDTO    请求参数
     * 
     * @param photoHandleDTO
     *            请求参数
     * @return  处理结果
     */
    @Override
@@ -299,7 +329,9 @@

    /**
     * 后台管理-批量修改随手拍公示状态/删除随手拍
     * @param photoEditDTO    请求参数
     * 
     * @param photoEditDTO
     *            请求参数
     * @return  修改/删除结果
     */
    @Override
@@ -307,7 +339,8 @@

        if(photoEditDTO.getType().equals(1)){
            Integer count = this.baseMapper.selectCount(new QueryWrapper<ComActEasyPhotoDO>().lambda()
                    .eq(ComActEasyPhotoDO::getHandleStatus,ComActEasyPhotoDO.handleStatus.no).in(ComActEasyPhotoDO::getId,photoEditDTO.getIds()));
                .eq(ComActEasyPhotoDO::getHandleStatus, ComActEasyPhotoDO.handleStatus.no)
                .in(ComActEasyPhotoDO::getId, photoEditDTO.getIds()));
            if(count > 0){
                return R.fail("您选择的有未处理的随手拍，不可进行操作");
            }