代码提交

 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java ÐÞ¸Ä
@@ -1,19 +1,12 @@
package com.vci.ubcs.system.cache;
package com.vci.ubcs.common.cache;

/*import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.Func;*/
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.core.env.Environment;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;

import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;

/**
 * redis中存储的nacos上配置的超管配置信息
@@ -35,7 +28,7 @@
     * nacos上配置的超管信息
     * @return
     */
    public BladeUser getAdminUserInfo() {
    /*public BladeUser getAdminUserInfo() {
        try {
            BladeUser user = CacheUtil.getCache(NACOS_CONFIG_CACHE).get(ADMIN_INFO_CODE,BladeUser.class);
            //从缓存中未获取到超级管理员配置信息，从nacos上重新获取并存入缓存。
@@ -51,6 +44,6 @@
        }catch (Exception e){
            throw new ServiceException("从nacos上获取超级管理员配置失败！");
        }
    }
    }*/

}

 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java

ÎļþÃû´Ó Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java ÐÞ¸Ä
@@ -1,11 +1,11 @@
package com.vci.ubcs.system.config;
package com.vci.ubcs.common.config;

import org.springblade.core.cache.utils.CacheUtil;
/*import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.utils.Func;
import org.springframework.data.redis.core.RedisTemplate;*/
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;

@@ -29,11 +29,11 @@

    @PostConstruct
    public void init() {
        BladeUser adminUser = new BladeUser();
        /*BladeUser adminUser = new BladeUser();
        adminUser.setTenantId(environment.getProperty("user-info.tenant-id", "000000"));
        adminUser.setUserName(environment.getProperty("user-info.user-name","admin"));
        adminUser.setUserId(Func.toLong(environment.getProperty("user-info.id","0")));
        CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);
        CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);*/
    }

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java

@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@@ -38,7 +39,7 @@
     * @param codeAllCode
     * @return
     */
    List<CodeAllCodeVO> selectCodeAllCodePage(IPage page, CodeAllCodeVO codeAllCode);
    List<CodeAllCodeVO> selectCodeAllCodePage(IPage page, CodeAllCodeVO codeAllCode, @Param("tenantId")String tenantId);


}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java

@@ -23,6 +23,8 @@
import com.vci.ubcs.code.mapper.CodeAllCodeMapper;
import com.vci.ubcs.code.service.ICodeAllCodeService;
import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
import com.vci.ubcs.common.cache.NacosConfigCache;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -44,9 +46,26 @@
    @Lazy
    private CodeAllCodeMapper codeAllcodeMapper;

    /**
     * nacos上拉取的配置
     */
    @Resource
    private NacosConfigCache nacosConfigCache;

    @Override
    public IPage<CodeAllCodeVO> selectCodeAllcodePage(IPage<CodeAllCodeVO> page, CodeAllCodeVO CodeAllcode) {
        return page.setRecords(baseMapper.selectCodeAllCodePage(page, CodeAllcode));
        IPage<CodeAllCodeVO> codeAllCodeVOIPage = page.setRecords(
            baseMapper.selectCodeAllCodePage(
                page,
                CodeAllcode,
                AuthUtil.getTenantId()
                    .equals(
                        nacosConfigCache
                            .getAdminUserInfo()
                            .getTenantId()
                    )
            ? null : AuthUtil.getTenantId()));
        return codeAllCodeVOIPage;
    }

    /**
@@ -58,6 +77,5 @@
    public List<CodeAllCode> selectByWrapper(Wrapper wrapper) {
        return this.codeAllcodeMapper.selectList(wrapper);
    }


}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java

@@ -238,7 +238,6 @@
                return R.fail("编码规则已被引用，不允许编辑或删除！");
            }
        }

        List<CodeAllCode> codeDOList = codeAllcodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCodeRuleOid, codeRuleDTO.getOid()));
        if (!CollectionUtils.isEmpty(codeDOList)) {
            return R.fail("编码规则已生成编码，不允许删除");

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml

@@ -6,12 +6,13 @@
    <resultMap id="CodeAllcodeResultMap" type="com.vci.ubcs.code.entity.CodeAllCode">
    </resultMap>


    <select id="selectCodeAllCodePage" resultMap="CodeAllcodeResultMap">
        select * from PL_CODE_ALLCODE

        <where>
            <if test="tenantId != null and tenantId != ''">
                TENANT_ID = #{tenantId}
            </if>
        </where>
    </select>



</mapper>

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java

@@ -47,7 +47,12 @@
     */
    Strategy queryByUserId(@Param("userId") Long userId);

    Strategy queryByIsDefault();
    /**
     * æŸ¥è¯¢å¯†ç é»˜è®¤çš„ç­–ç•¥
     * @param tenantId
     * @return
     */
    Strategy queryByIsDefault(@Param("tenantId") String tenantId);

}


 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.common.constant.CommonConstant;
import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.common.cache.NacosConfigCache;
import com.vci.ubcs.system.entity.Strategy;
import com.vci.ubcs.system.mapper.StrategyMapper;
import com.vci.ubcs.system.service.IStrategyService;
@@ -15,7 +15,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.data.domain.PageImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -43,6 +42,9 @@
    @Resource
    private IUserClient userClient;

    /**
     * nacos上拉取的配置
     */
    @Resource
    private NacosConfigCache nacosConfigCache;

@@ -63,7 +65,13 @@
     */
    @Override
    public Strategy queryByIsDefault() {
        return this.strategyMapper.queryByIsDefault();
        return this.strategyMapper.queryByIsDefault(AuthUtil.getTenantId()
            .equals(
                nacosConfigCache
                    .getAdminUserInfo()
                    .getTenantId()
            ) ? null:AuthUtil.getTenantId()
        );
    }

    /**
@@ -83,7 +91,8 @@
                    nacosConfigCache
                    .getAdminUserInfo()
                    .getTenantId()
                ) ? null:AuthUtil.getTenantId()
                )
            ? null:AuthUtil.getTenantId()
        );
        return strategyIPage;
    }

 Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml

@@ -30,9 +30,9 @@
                where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
        from PL_SYS_PWDSTRATEGY pss
        <where>
        <if test="tenantId != null and tenantId != ''">
            and TENANT_ID = #{tenantId}
        </if>
            <if test="tenantId != null and tenantId != ''">
                TENANT_ID = #{tenantId}
            </if>
        </where>
    </select>

@@ -92,7 +92,6 @@
        </where>
    </select>


    <select id="queryByNameAndTenantId" resultMap="StrategyMap">
        SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
                      from PL_SYS_COMBINATION psc
@@ -117,6 +116,9 @@
                      WHERE instr(pss.COMBINATION_IDS, psc.ID) > 0) COMBINATIONNAMES
        FROM PL_SYS_PWDSTRATEGY PSS
        WHERE is_default = 1
        <if test="tenantId != null and tenantId != ''">
            and TENANT_ID = #{tenantId}
        </if>
    </select>

</mapper>