圈子添加字段

lin

2024-03-21 af1dc4642c06245a885c870d542a2401009b933a

圈子添加字段

 src/main/java/org/springblade/modules/circle/controller/CircleController.java

@@ -16,28 +16,26 @@
 */
package org.springblade.modules.circle.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;

import javax.validation.Valid;

import org.apache.logging.log4j.util.Strings;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.circle.entity.CircleEntity;
import org.springblade.modules.circle.service.ICircleService;
import org.springblade.modules.circle.vo.CircleVO;
import org.springblade.modules.circle.wrapper.CircleWrapper;
import org.springblade.modules.circle.service.ICircleService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;

/**
 * 圈子表 控制器
@@ -94,7 +92,6 @@
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "新增", notes = "传入circle")
    public R save(@Valid @RequestBody CircleEntity circle) {
        circle.setUserId(AuthUtil.getUserId());
        String msg = circleService.saveCircle(circle);
        if (!Strings.isBlank(msg)&& msg.equals("操作成功")){
            return R.data(200,"",msg);

 src/main/java/org/springblade/modules/circle/entity/CircleEntity.java

@@ -79,4 +79,24 @@
    @ApiModelProperty(value = "0 :邻里 1网格", example = "")
    @TableField("circle_type")
    private Integer circleType;

    /** 事件id */
    @ApiModelProperty(value = "事件id", example = "")
    @TableField("event_id")
    private Long eventId;

    /** 事件类型：1：报事报修 */
    @ApiModelProperty(value = "事件类型：1：报事报修", example = "")
    @TableField("even_type")
    private Integer evenType;

    /** 社区编号 */
    @ApiModelProperty(value = "社区编号", example = "")
    @TableField("community_code")
    private String communityCode;

    /** 房屋编码 */
    @ApiModelProperty(value = "房屋编码", example = "")
    @TableField("house_code")
    private String houseCode;
}

 src/main/java/org/springblade/modules/circle/mapper/CircleMapper.xml

@@ -11,6 +11,10 @@
        <result property="circleVideo"    column="circle_video"    />
        <result property="deletedFalg"    column="deleted_falg"    />
        <result property="circleType"    column="circle_type"    />
        <result property="eventId"    column="event_id"    />
        <result property="evenType"    column="even_type"    />
        <result property="communityCode"    column="community_code"    />
        <result property="houseCode"    column="house_code"    />
    </resultMap>

    <sql id="selectCircle">
@@ -22,7 +26,11 @@
            circle_images,
            circle_video,
            deleted_falg,
            circle_type
            circle_type,
            event_id,
            even_type,
            community_code,
            house_code
        from
            jczz_circle
    </sql>
@@ -49,16 +57,9 @@


    <select id="selectCirclePage" resultMap="CircleVOResult">
        select jc.id,
        jc.user_id,
        jc.create_time,
        jc.circle_text,
        jc.circle_images,
        jc.circle_video,
        jc.deleted_falg,
        select jc.*,
        bu.name,
        bu.avatar,
        jc.circle_type,
        (select count(1) from jczz_circle_like jcl where jcl.circle_id = jc.id and jcl.user_id = #{circle.userIds} and
        jcl.delete_flag = 0 ) likeFlag
        from jczz_circle jc left join blade_user bu on jc.user_id = bu.id
@@ -77,6 +78,10 @@
            </if>
            <if test="circle.deletedFalg != null ">and jc.deleted_falg = #{circle.deletedFalg}</if>
            <if test="circle.circleType != null ">and jc.circle_type = #{circle.circleType}</if>
            <if test="circle.eventId != null "> and event_id = #{circle.eventId}</if>
            <if test="circle.evenType != null "> and even_type = #{circle.evenType}</if>
            <if test="circle.communityCode != null  and circle.communityCode != ''"> and community_code = #{circle.communityCode}</if>
            <if test="circle.houseCode != null  and circle.houseCode != ''"> and house_code = #{circle.houseCode}</if>
        </where>
        order by jc.create_time desc
    </select>

 src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java

@@ -18,6 +18,9 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.circle.dto.CircleDTO;
import org.springblade.modules.circle.entity.CircleCommentEntity;
import org.springblade.modules.circle.entity.CircleEntity;
@@ -53,6 +56,7 @@

    @Autowired
    private ICircleCommentService iCircleCommentService;

    @Override
    public IPage<CircleVO> selectCirclePage(IPage<CircleVO> page, CircleVO circle) {
        List<CircleVO> circleVOS = baseMapper.selectCirclePage(page, circle);
@@ -78,8 +82,7 @@
     * @return 圈子表
     */
    @Override
    public CircleVO selectCircleById(Integer id)
    {
    public CircleVO selectCircleById(Integer id) {
        return this.baseMapper.selectCircleById(id);
    }

@@ -90,13 +93,17 @@
     * @return 圈子表集合
     */
    @Override
    public List<CircleVO> selectCircleList(CircleDTO circleDTO)
    {
    public List<CircleVO> selectCircleList(CircleDTO circleDTO) {
        return this.baseMapper.selectCircleList(circleDTO);
    }

    @Override
    public String saveCircle(CircleEntity circle) {
        circle.setUserId(AuthUtil.getUserId());
        String communityCode = SpringUtils.getRequestParam("communityCode");
        if (StringUtils.isNotBlank(communityCode)) {
            circle.setCommunityCode(communityCode);
        }
        boolean flag = false;
        // 先进行敏感词过滤
        Map<String, Object> map = worksService.interceptWords(circle.getCircleText());