lin
2024-03-27 732c48ac2cffe3c40174a63dbd5df26023e66121
圈子使用社区编码过滤
5 files modified
25 ■■■■ changed files
src/main/java/org/springblade/common/node/TreeStringNode.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/circle/vo/CircleVO.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/common/node/TreeStringNode.java
@@ -39,6 +39,11 @@
    private String aoiCode;
    /**
     * 社区编码
     */
    private String neiCode;
    /**
     * 门牌类型
     */
    private String doorplateType;
src/main/java/org/springblade/modules/circle/service/impl/CircleServiceImpl.java
@@ -16,25 +16,25 @@
 */
package org.springblade.modules.circle.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.param.CommonParamSet;
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;
import org.springblade.modules.circle.entity.CircleLikeEntity;
import org.springblade.modules.circle.mapper.CircleMapper;
import org.springblade.modules.circle.service.ICircleCommentService;
import org.springblade.modules.circle.service.ICircleLikeService;
import org.springblade.modules.circle.vo.CircleVO;
import org.springblade.modules.circle.mapper.CircleMapper;
import org.springblade.modules.circle.service.ICircleService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.circle.vo.CircleVO;
import org.springblade.modules.words.WorksService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
import java.util.Map;
@@ -59,6 +59,7 @@
    @Override
    public IPage<CircleVO> selectCirclePage(IPage<CircleVO> page, CircleVO circle) {
        CommonParamSet commonParamSet = new CommonParamSet().invoke(CircleVO.class, circle);
        List<CircleVO> circleVOS = baseMapper.selectCirclePage(page, circle);
        for (CircleVO circleVO : circleVOS) {
            // 获取circleVO中circleId的点赞数
src/main/java/org/springblade/modules/circle/vo/CircleVO.java
@@ -16,6 +16,7 @@
 */
package org.springblade.modules.circle.vo;
import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.circle.entity.CircleEntity;
import org.springblade.core.tool.node.INode;
import lombok.Data;
@@ -43,5 +44,13 @@
    private Long commentCount;
    private Long likeCount;
    // 角色名称
    @ApiModelProperty(value = "角色名称", example = "")
    private String roleName;
    // 社区编号
    @ApiModelProperty(value = "社区编号", example = "")
    private String communityCode;
}
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -451,6 +451,7 @@
               jda.doorplate_type  doorplateType,
               jda.address_level   addressLevel,
               jda.nei_name        neiName,
               jda.nei_code        neiCode,
               jda.aoi_code        aoiCode,
               jh.relationship     relationship
        from jczz_household jh
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -284,6 +284,7 @@
               jp.is_nine AS isNine,
               jp.is_front AS isFront,
               br.name neiName,
               jg.community_code neiCode,
               FALSE         AS   hasChildren
        FROM jczz_place jp
                 LEFT JOIN jczz_grid jg on jp.grid_code = jg.grid_code and jg.is_deleted = 0