轮播图过滤

lin

2024-04-12 9f1231e99e160ea64d0ff82ad7297f3438423c46

轮播图过滤

 src/main/java/org/springblade/common/utils/AuthUtils.java

@@ -22,6 +22,14 @@
    }

    /**
     * 是否居民
     * @return
     */
    public static boolean isInhabitant(String roleName) {
        return StringUtil.containsAny(roleName, new CharSequence[]{"inhabitant"});
    }

    /**
     * 是否管理员角色
     * @return
     */

 src/main/java/org/springblade/modules/article/entity/Article.java

@@ -63,6 +63,11 @@
    @TableField("article_type")
    private String articleType;

    /** 资讯类型 */
    @ApiModelProperty(value = "文章细类", example = "")
    @TableField("article_subcategory")
    private String articleSubcategory;

    /** 是否推荐 1：推荐   2：不推荐 */
    @ApiModelProperty(value = "是否推荐 1：推荐   2：不推荐", example = "")
    @TableField("recommend")

 src/main/java/org/springblade/modules/rotation/service/impl/RotationServiceImpl.java

@@ -16,28 +16,29 @@
 */
package org.springblade.modules.rotation.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.RoleUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.rotation.entity.RotationEntity;
import org.springblade.modules.rotation.vo.RotationVO;
import org.springblade.modules.rotation.mapper.RotationMapper;
import org.springblade.modules.rotation.service.IRotationService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.rotation.vo.RotationVO;
import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

import java.util.ArrayList;
import java.util.List;
@@ -65,7 +66,7 @@
     */
    @Override
    public IPage<RotationVO> selectRotationPage(IPage<RotationVO> page, RotationVO rotation) {
        CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(RotationVO.class,rotation);
        CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(RotationVO.class, rotation);
        String userRole = AuthUtil.getUserRole();
        if (RoleUtil.isProperty(userRole)) {
            // 查询小区id
@@ -91,18 +92,26 @@
            }
            rotation.setPropertyFlag(1);
        }
        if (StringUtils.isNotBlank(rotation.getAoiCode())) {
            // 查询房屋的小区
            IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
            DistrictEntity one = bean.getOne(Wrappers.<DistrictEntity>lambdaQuery().eq(DistrictEntity::getAoiCode, rotation.getAoiCode()));
            List<String> districtIds = new ArrayList<>();
            districtIds.add(one.getId());
            rotation.setDistrictIdList(districtIds);
        }
        List<RotationVO> rotationVOList = baseMapper.selectRotationPage(page, rotation,
            commonParamSet.getIsAdministrator(),
            null==commonParamSet.getRegionChildCodesList()?null:String.join("|",commonParamSet.getRegionChildCodesList()),
            null==commonParamSet.getGridCodeList()?null:String.join("|",commonParamSet.getGridCodeList()));
        if (rotationVOList.size()==0){
            null == commonParamSet.getRegionChildCodesList() ? null : String.join("|", commonParamSet.getRegionChildCodesList()),
            null == commonParamSet.getGridCodeList() ? null : String.join("|", commonParamSet.getGridCodeList()));
        if (rotationVOList.size() == 0) {
            // 如果没有对应的轮播图，则采用系统默认的
            rotation.setType(3);
            rotationVOList = baseMapper.selectRotationPage(page,
                rotation,
                1,
                null==commonParamSet.getRegionChildCodesList()?null:String.join("|",commonParamSet.getRegionChildCodesList()),
                null==commonParamSet.getGridCodeList()?null:String.join("|",commonParamSet.getGridCodeList()));
                null == commonParamSet.getRegionChildCodesList() ? null : String.join("|", commonParamSet.getRegionChildCodesList()),
                null == commonParamSet.getGridCodeList() ? null : String.join("|", commonParamSet.getGridCodeList()));
        }
        return page.setRecords(rotationVOList);
    }

 src/main/java/org/springblade/modules/rotation/vo/RotationVO.java

@@ -50,6 +50,11 @@
    private String communityCode;

    /**
     * 小区编码
     */
    private String aoiCode;

    /**
     * 角色别名
     */
    private String roleName;