修改bug以及社区动态改版接口

huanghongfa

2021-07-22 79c259305f0d1739ba459947ba08570242cdae94

修改bug以及社区动态改版接口

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxOfficialApi.java

@@ -6,7 +6,6 @@
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.web.bind.annotation.*;

import java.io.*;
@@ -94,9 +93,8 @@
        return sb.toString();
    }


    @ApiOperation(value = "拉取公众号列表")
    @GetMapping("/list/noToken")
    @GetMapping(value = "/list/noToken",produces="application/json;charset=UTF-8")
    public R pageDiscuss() throws Exception{
        WxOfficialApi officialApi = new WxOfficialApi();


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/AddComActDynTypeDTO.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

import javax.validation.constraints.NotBlank;

@Data
@ApiModel("新增社区动态分类请求参数")
public class AddComActDynTypeDTO {

    @ApiModelProperty("分类名称")
    @NotBlank(message = "分类名称不能为空")
    @Length(min = 1, max = 5, message = "分类名称不可超过5个字")
    private String name;

    @ApiModelProperty("分类字体颜色")
    @NotBlank(message = "分类字体颜色不能为空")
    private String color;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "操作人员id",hidden = true)
    private Long userId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EditComActDynTypeDTO.java

New file
@@ -0,0 +1,25 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;

@Data
@ApiModel("新增社区动态分类请求参数")
public class EditComActDynTypeDTO {

    @ApiModelProperty("主键(分类编码)")
    private Long id;

    @ApiModelProperty("分类名称")
    @Length(min = 1, max = 5, message = "分类名称不可超过5个字")
    private String name;

    @ApiModelProperty("分类字体颜色")
    private String color;

    @ApiModelProperty(value = "操作人员id",hidden = true)
    private Long userId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComActDynTypeDTO.java

New file
@@ -0,0 +1,23 @@
package com.panzhihua.common.model.dtos.community;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("分页查询社区动态分类请求参数")
public class PageComActDynTypeDTO {

    @ApiModelProperty(value = "当前页数",example = "1")
    private Long pageNum = 1L;

    @ApiModelProperty(value = "每页记录数",example = "10")
    private Long pageSize = 10L;

    @ApiModelProperty("关键词")
    private String keyWord;

    @ApiModelProperty(value = "社区id",hidden = true)
    private Long communityId;

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java

New file
@@ -0,0 +1,39 @@
package com.panzhihua.common.model.vos.community;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * 社区动态分类
 */
@Data
@ApiModel("社区动态分类")
public class ComActDynTypeVO {

    @ApiModelProperty("主键(分类编码)")
    private Long id;

    @ApiModelProperty("分类名称")
    private String name;

    @ApiModelProperty("分类字体颜色")
    private String color;

    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;

    @ApiModelProperty("创建人")
    private String createBy;

    @ApiModelProperty("修改时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateAt;

    @ApiModelProperty("修改人")
    private String updateBy;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java

@@ -77,8 +77,14 @@
    @ApiModelProperty(value = "是否增加 1 增加 0 不增加")
    private Integer isAdd;

    @ApiModelProperty(value = "分类：1-社区风采 2-社区动态")
    private Integer type;
    @ApiModelProperty(value = "社区动态分类id")
    private Long type;

    @ApiModelProperty(value = "社区动态分类名称")
    private String typeName;

    @ApiModelProperty(value = "社区动态分类颜色")
    private String typeColor;

    @ApiModelProperty(value = "封面模式：1-小图展示 2-大图展示")
    private Integer coverMode;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -3662,4 +3662,44 @@
     */
    @PostMapping("/population/page/exServiceman")
    R pageExServiceman(@RequestBody ComExServicemanDTO comExServicemanDTO);

    /**
     * 分页查询社区动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    @PostMapping("/dyn/type/page")
    R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);

    /**
     * 查询社区下所有动态分类列表
     * @param comActDynTypeDTO  请求参数
     * @return  动态分类列表
     */
    @PostMapping("/dyn/type/list")
    R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO);

    /**
     * 添加社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  添加结果
     */
    @PostMapping("/dyn/type/add")
    R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO);

    /**
     * 编辑社区动态分类
     * @param comActDynTypeDTO  请求参数
     * @return  编辑结果
     */
    @PostMapping("/dyn/type/edit")
    R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO);

    /**
     * 删除社区动态分类
     * @param ids   社区动态分类id集合
     * @return  删除结果
     */
    @PostMapping("/dyn/type/delete")
    R deleteDynTypeByAdmin(@RequestBody List<Long> ids);
}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ActDynTypeApi.java

New file
@@ -0,0 +1,77 @@
package com.panzhihua.community_backstage.api;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDynTypeVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

@Slf4j
@Api(tags = {"社区动态分类模块"})
@RestController
@RequestMapping("/dyn/type/")
public class ActDynTypeApi extends BaseController {

    @Resource
    private CommunityService communityService;

    @ApiOperation(value = "分页查询社区动态列表", response = ComActDynTypeVO.class)
    @PostMapping("/page")
    public R page(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        Long communityId = this.getCommunityId();
        comActDynTypeDTO.setCommunityId(communityId);
        return communityService.pageDynTypeByAdmin(comActDynTypeDTO);
    }

    @ApiOperation(value = "查询社区动态分类列表", response = ComActDynTypeVO.class)
    @PostMapping("/list")
    public R list(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        Long communityId = this.getCommunityId();
        comActDynTypeDTO.setCommunityId(communityId);
        return communityService.getDynTypeListByAdmin(comActDynTypeDTO);
    }

    @ApiOperation(value = "新增社区动态分类")
    @PostMapping("/add")
    public R add(@Validated @RequestBody AddComActDynTypeDTO comActDynTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        comActDynTypeDTO.setCommunityId(loginUserInfo.getCommunityId());
        comActDynTypeDTO.setUserId(loginUserInfo.getUserId());
        return communityService.addDynTypeByAdmin(comActDynTypeDTO);
    }

    @ApiOperation(value = "编辑社区动态分类")
    @PostMapping("/edit")
    public R add(@Validated @RequestBody EditComActDynTypeDTO comActDynTypeDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        comActDynTypeDTO.setUserId(loginUserInfo.getUserId());
        return communityService.editDynTypeByAdmin(comActDynTypeDTO);
    }

    @ApiOperation(value = "删除社区动态分类")
    @PostMapping("/delete")
    public R delete(@RequestBody List<Long> ids) {
        if(ids == null || ids.size() <= 0){
            return R.fail("参数错误");
        }
        return communityService.deleteDynTypeByAdmin(ids);
    }



}

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

New file
@@ -0,0 +1,49 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComActDynTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

@Slf4j
@RestController
@RequestMapping("/dyn/type/")
public class ActDynTypeApi {

    @Resource
    private ComActDynTypeService comActDynTypeService;

    @PostMapping("/page")
    public R pageDynTypeByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        return comActDynTypeService.pageDynTypeByAdmin(comActDynTypeDTO);
    }

    @PostMapping("/list")
    public R getDynTypeListByAdmin(@RequestBody PageComActDynTypeDTO comActDynTypeDTO) {
        return comActDynTypeService.getDynTypeListByAdmin(comActDynTypeDTO);
    }

    @PostMapping("/add")
    public R addDynTypeByAdmin(@RequestBody AddComActDynTypeDTO comActDynTypeDTO) {
        return comActDynTypeService.addDynTypeByAdmin(comActDynTypeDTO);
    }

    @PostMapping("/edit")
    public R editDynTypeByAdmin(@RequestBody EditComActDynTypeDTO comActDynTypeDTO) {
        return comActDynTypeService.editDynTypeByAdmin(comActDynTypeDTO);
    }

    @PostMapping("/delete")
    public R deleteDynTypeByAdmin(@RequestBody List<Long> ids) {
        return comActDynTypeService.deleteDynTypeByAdmin(ids);
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynDAO.java

@@ -36,10 +36,13 @@
            "d.is_topping, " +
            "d.publish_at, " +
            "d.create_at, " +
            "cadt.`name` as typeName, " +
            "cadt.color as typeColor, " +
            "ca.name as communityName  " +
            "FROM " +
            "com_act_dyn d " +
            "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  " +
            "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  " +
            "LEFT JOIN com_act ca ON d.community_id = ca.community_id  " +
            "WHERE 1=1  " +
            "<if test='comActDynVO.choice == 0 '>" +
@@ -78,10 +81,12 @@
            "d.is_topping, " +
            "d.publish_at, " +
            "d.create_at, " +
            "cadt.`name` as typeName, " +
            "ca.name as communityName  " +
            "FROM " +
            "com_act_dyn d " +
            "LEFT JOIN com_act_dyn_user u ON d.id = u.dyn_id  " +
            "LEFT JOIN com_act_dyn_type as cadt ON cadt.id = d.type  " +
            "LEFT JOIN com_act ca ON d.community_id = ca.community_id  " +
            "WHERE  " +
            "d.community_id=#{comActDynVO.communityId} " +

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDynTypeMapper.java

New file
@@ -0,0 +1,30 @@
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.PageComActDynTypeDTO;
import com.panzhihua.common.model.vos.community.ComActDynTypeVO;
import com.panzhihua.service_community.model.dos.ComActDynTypeDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @auther lyq
 * @create 2021-07-22 11:28:27
 * @describe 社区动态分类mapper类
 */
@Mapper
public interface ComActDynTypeMapper extends BaseMapper<ComActDynTypeDO> {

    IPage<ComActDynTypeVO> pageDynTypeByAdmin(Page page, @Param("comActDynTypeDTO") PageComActDynTypeDTO comActDynTypeDTO);

    List<ComActDynTypeVO> getDynTypeListByAdmin(@Param("comActDynTypeDTO") PageComActDynTypeDTO comActDynTypeDTO);

    Integer getDynCountByDynTypeIds(@Param("ids") List<Long> ids);

    Integer deleteDynTypeByIds(@Param("ids") List<Long> ids);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynDO.java

@@ -68,9 +68,9 @@
    private String cover;

    /**
     * 分类：1-社区风采 2-社区动态
     * 社区动态分类id
     */
    private Integer type;
    private Long type;

    /**
     * 封面模式：1-小图展示 2-大图展示

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDynTypeDO.java

New file
@@ -0,0 +1,92 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;


/**
 * @auther lyq
 * @create 2021-07-22 11:28:27
 * @describe 社区动态分类实体类
 */

@Data
@TableName("com_act_dyn_type")
public class ComActDynTypeDO implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 分类名称
     */
    private String name;

    /**
     * 字体颜色
     */
    private String color;

    /**
     * 是否删除（1.是 2.否）
     */
    private Integer isDel;

    /**
     * 社区id(为0时表示系统分类无法更改的)
     */
    private Long communityId;

    /**
     * 创建时间
     */
    private Date createAt;

    /**
     * 创建人
     */
    private Long createBy;

    /**
     * 修改时间
     */
    private Date updateAt;

    /**
     * 修改人
     */
    private Long updateBy;

    /**
     * 是否删除（1.是 2.否）
     */
    public interface isDel{
        int yes = 1;
        int no = 2;
    }

    @Override
    public String toString() {
        return "ComActDynTypeDO{" +
                "id=" + id +
                ", name=" + name +
                ", color=" + color +
                ", isDel=" + isDel +
                ", communityId=" + communityId +
                ", createAt=" + createAt +
                ", createBy=" + createBy +
                ", updateAt=" + updateAt +
                ", updateBy=" + updateBy +
                "}";
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDynTypeService.java

New file
@@ -0,0 +1,29 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActDynTypeDO;

import java.util.List;

/**
 * @auther lyq
 * @create 2021-07-22 11:28:27
 * @describe 社区动态分类服务类
 */
public interface ComActDynTypeService extends IService<ComActDynTypeDO> {

    R pageDynTypeByAdmin(PageComActDynTypeDTO comActDynTypeDTO);

    R getDynTypeListByAdmin(PageComActDynTypeDTO comActDynTypeDTO);

    R addDynTypeByAdmin(AddComActDynTypeDTO comActDynTypeDTO);

    R editDynTypeByAdmin(EditComActDynTypeDTO comActDynTypeDTO);

    R deleteDynTypeByAdmin(List<Long> ids);

}

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

New file
@@ -0,0 +1,104 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComActDynTypeMapper;
import com.panzhihua.service_community.model.dos.ComActDynTypeDO;
import com.panzhihua.service_community.service.ComActDynTypeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

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

/**
 * @auther lyq
 * @create 2021-07-22 11:28:27
 * @describe 社区动态分类服务实现类
 */
@Slf4j
@Service
public class ComActDynTypeServiceImpl extends ServiceImpl<ComActDynTypeMapper, ComActDynTypeDO> implements ComActDynTypeService {

    @Override
    public R pageDynTypeByAdmin(PageComActDynTypeDTO comActDynTypeDTO){
        return R.ok(this.baseMapper.pageDynTypeByAdmin(new Page(comActDynTypeDTO.getPageNum(),comActDynTypeDTO.getPageSize()),comActDynTypeDTO));
    }

    @Override
    public R getDynTypeListByAdmin(PageComActDynTypeDTO comActDynTypeDTO){
        return R.ok(this.baseMapper.getDynTypeListByAdmin(comActDynTypeDTO));
    }

    @Override
    public R addDynTypeByAdmin(AddComActDynTypeDTO comActDynTypeDTO){

        ComActDynTypeDO dynTypeDO = this.baseMapper.selectOne(new QueryWrapper<ComActDynTypeDO>().lambda()
                .eq(ComActDynTypeDO::getCommunityId,comActDynTypeDTO.getCommunityId())
                .eq(ComActDynTypeDO::getName,comActDynTypeDTO.getName()).eq(ComActDynTypeDO::getIsDel,ComActDynTypeDO.isDel.no));
        if(dynTypeDO != null){
            return R.fail("该分类名称已存在！");
        }

        dynTypeDO = new ComActDynTypeDO();
        BeanUtils.copyProperties(comActDynTypeDTO,dynTypeDO);
        dynTypeDO.setCreateBy(comActDynTypeDTO.getUserId());
        dynTypeDO.setCreateAt(new Date());

        if(this.baseMapper.insert(dynTypeDO) > 0){
            return R.ok();
        }else{
            return R.fail("添加失败");
        }
    }

    @Override
    public R editDynTypeByAdmin(EditComActDynTypeDTO comActDynTypeDTO){

        ComActDynTypeDO dynTypeDO = this.baseMapper.selectById(comActDynTypeDTO.getId());
        if(dynTypeDO == null){
            return R.fail("未查询到记录");
        }

        Integer count = this.baseMapper.selectCount(new QueryWrapper<ComActDynTypeDO>().lambda()
                .eq(ComActDynTypeDO::getCommunityId,dynTypeDO.getCommunityId())
                .eq(ComActDynTypeDO::getName,comActDynTypeDTO.getName())
                .eq(ComActDynTypeDO::getIsDel,ComActDynTypeDO.isDel.no)
                .ne(ComActDynTypeDO::getId,comActDynTypeDTO.getId()));

        if(count > 0){
            return R.fail("该分类名称已存在！");
        }

        BeanUtils.copyProperties(comActDynTypeDTO,dynTypeDO);
        dynTypeDO.setUpdateBy(comActDynTypeDTO.getUserId());
        dynTypeDO.setUpdateAt(new Date());

        if(this.baseMapper.updateById(dynTypeDO) > 0){
            return R.ok();
        }else{
            return R.fail("添加失败");
        }
    }

    @Override
    public R deleteDynTypeByAdmin(List<Long> ids){
        Integer count = this.baseMapper.getDynCountByDynTypeIds(ids);
        if(count > 0){
            return R.fail("您选中的分类中包含已被引用，无法删除！");
        }

        if(this.baseMapper.deleteDynTypeByIds(ids) > 0){
            return R.ok();
        }else{
            return R.fail("删除失败");
        }
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml

New file
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.ComActDynTypeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.panzhihua.service_community.model.dos.ComActDynTypeDO">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="color" property="color" />
        <result column="is_del" property="isDel" />
        <result column="community_id" property="communityId" />
        <result column="create_at" property="createAt" />
        <result column="create_by" property="createBy" />
        <result column="update_at" property="updateAt" />
        <result column="update_by" property="updateBy" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, name, color, is_del, community_id, create_at, create_by, update_at, update_by
    </sql>

    <select id="pageDynTypeByAdmin" parameterType="com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO"
            resultType="com.panzhihua.common.model.vos.community.ComActDynTypeVO">
        SELECT
            cadt.id,
            cadt.`name`,
            cadt.color,
            cadt.create_at,
            cadt.update_at,
            su.`name` AS createBy,
            su1.`name` AS updateBy
        FROM
            com_act_dyn_type AS cadt
            LEFT JOIN sys_user AS su ON su.user_id = cadt.create_by
            LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
            where cadt.community_id = 0 and cadt.is_del = 2
            <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
                and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))
            </if>
            union all

            SELECT
            cadt.id,
            cadt.`name`,
            cadt.color,
            cadt.create_at,
            cadt.update_at,
            su.`name` AS createBy,
            su1.`name` AS updateBy
        FROM
            com_act_dyn_type AS cadt
            LEFT JOIN sys_user AS su ON su.user_id = cadt.create_by
            LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
            where cadt.is_del = 2
            <if test="comActDynTypeDTO.communityId != null">
                and cadt.community_id = #{comActDynTypeDTO.communityId}
            </if>
            <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
                and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))
            </if>
    </select>

    <select id="getDynTypeListByAdmin" parameterType="com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO"
            resultType="com.panzhihua.common.model.vos.community.ComActDynTypeVO">
        SELECT
        cadt.id,
        cadt.`name`,
        cadt.color,
        cadt.create_at,
        cadt.update_at,
        su.`name` AS createBy,
        su1.`name` AS updateBy
        FROM
        com_act_dyn_type AS cadt
        LEFT JOIN sys_user AS su ON su.user_id = cadt.create_by
        LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
        where cadt.community_id = 0 and cadt.is_del = 2
        <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
            and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))
        </if>
        union all

        SELECT
        cadt.id,
        cadt.`name`,
        cadt.color,
        cadt.create_at,
        cadt.update_at,
        su.`name` AS createBy,
        su1.`name` AS updateBy
        FROM
        com_act_dyn_type AS cadt
        LEFT JOIN sys_user AS su ON su.user_id = cadt.create_by
        LEFT JOIN sys_user AS su1 ON su1.user_id = cadt.update_by
        where cadt.is_del = 2
        <if test="comActDynTypeDTO.communityId != null">
            and cadt.community_id = #{comActDynTypeDTO.communityId}
        </if>
        <if test="comActDynTypeDTO.keyWord != null and comActDynTypeDTO.keyWord != &quot;&quot;">
            and (cadt.id = #{comActDynTypeDTO.keyWord} or cadt.`name` like concat (#{comActDynTypeDTO.keyWord},'%'))
        </if>
    </select>

    <select id="getDynCountByDynTypeIds" parameterType="List" resultType="Integer">
        select count(id) from com_act_dyn where `type` in
        <foreach collection='ids' item='id' index='index' open='(' close=')' separator=',' >
        #{id}
        </foreach>
    </select>

    <update id="deleteDynTypeByIds" parameterType="List">
        update com_act_dyn_type set is_del = 1 where id in
        <foreach collection='ids' item='id' index='index' open='(' close=')' separator=',' >
            #{id}
        </foreach>
    </update>

</mapper>