getCodeRuleByClassifyOid接口修改

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java

@@ -149,7 +149,6 @@
     */
    private String filterSql ;


    /**
     * æµæ°´å·èµ·å§‹å€¼
     */
@@ -159,7 +158,6 @@
     * æµæ°´çš„步长
     */
    private Integer serialStep;


    /**
     * ç¼–码补位方式
@@ -211,7 +209,6 @@
     */
    private String parentClassifySecText;


    /**
     * æ˜¯å¦å¯ä»¥ä¸ºç©º
     */
@@ -238,6 +235,11 @@
    private Integer serialDependOrder;

    /**
     * ç å€¼ç”³è¯·è¡¨å•ä¸­æ˜¾ç¤ºéšè—ç­‰çŠ¶æ€ï¼š 1(可输)、2(只读)、3(隐藏)
     */
    private Integer codeValueApplyStatus;

    /**
     * å›ºå®šç çš„码值内容
     */
    private List<CodeFixedValueVO> fixedValueVOList;

 Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java

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

/*import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.utils.Func;*/
import org.springblade.core.tool.utils.Func;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
@@ -28,7 +31,7 @@
     * nacos上配置的超管信息
     * @return
     */
    /*public BladeUser getAdminUserInfo() {
    public BladeUser getAdminUserInfo() {
        try {
            BladeUser user = CacheUtil.getCache(NACOS_CONFIG_CACHE).get(ADMIN_INFO_CODE,BladeUser.class);
            //从缓存中未获取到超级管理员配置信息，从nacos上重新获取并存入缓存。
@@ -44,6 +47,6 @@
        }catch (Exception e){
            throw new ServiceException("从nacos上获取超级管理员配置失败！");
        }
    }*/
    }

}

 Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java

ÎļþÃû´Ó Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java ÐÞ¸Ä
@@ -1,9 +1,9 @@
package com.vci.ubcs.common.config;
package com.vci.ubcs.system.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.data.redis.core.RedisTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.core.env.Environment;
@@ -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/controller/CodeButtonController.java

@@ -70,6 +70,7 @@
        CodeButton detail = codeButtonMapper.selectOne(Condition.getQueryWrapper(codebutton));
        return R.data(CodeButtonWrapper.build().entityVO(detail));
    }

    /**
     * æ¨¡æ¿æ‰©å±•æ±  åˆ†é¡µ
     */

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

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


}

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

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

@@ -23,8 +23,6 @@
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;
@@ -46,26 +44,9 @@
    @Lazy
    private CodeAllCodeMapper codeAllcodeMapper;

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

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

    /**

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

@@ -2739,11 +2739,100 @@
        String codeRuleOid = classifyVO.getCodeRuleOid();
        if (StringUtils.isBlank(codeRuleOid)) {
            //往上找
            CodeClassifyFullInfoBO fullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
            return getCodeRuleByClassifyFullInfo(fullInfo);
            CodeRuleVO classifyFullInfoCodeRule = getCodeRuleByClassifyFullInfo(classifyService.getClassifyFullInfo(codeClassifyOid));
            return toCodeValueApplyStatus(classifyFullInfoCodeRule);
        }
        //查询编码规则
        return ruleService.getObjectHasSecByOid(codeRuleOid);
        CodeRuleVO objectHasSecByOid = ruleService.getObjectHasSecByOid(codeRuleOid);
        return toCodeValueApplyStatus(objectHasSecByOid);
    }

    /**
     * ç¼–码申请表单，隐藏、可输、只读转换
     * @param codeRuleVO
     * @return
     */
    private CodeRuleVO toCodeValueApplyStatus(CodeRuleVO codeRuleVO){
        if(codeRuleVO.getSecVOList().isEmpty()){
            return codeRuleVO;
        }
        // å¯è¾“码段类型
        List<String> inputTypes = Arrays.asList(
            CodeSecTypeEnum.CODE_FIXED_SEC.getValue(),
            CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue(),
            CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue(),
            CodeSecTypeEnum.CODE_REFER_SEC.getValue()
        );
        // åªè¯»ç æ®µç±»åž‹
        List<String> readOnlyTypes = Arrays.asList(
            CodeSecTypeEnum.CODE_LEVEL_SEC.getValue(),
            CodeSecTypeEnum.CODE_ATTR_SEC.getValue(),
            CodeSecTypeEnum.CODE_DATE_SEC.getValue()
        );
        // éšè—ç æ®µç±»åž‹
        /*List<String> hideType = Arrays.asList(
            CodeSecTypeEnum.CODE_SERIAL_SEC.getValue()
        );*/
        // å½“前规则的所有类型码段
        List<String> secTypeList = codeRuleVO.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.toList());
        // æƒ…况一 å…¨éƒ¨æ˜¯åªè¯»çš„码段类型
        boolean hasAllReadOnlyType =secTypeList.stream().allMatch(item -> readOnlyTypes.stream().anyMatch(item1-> item.equals(item1)));
        // å…¨éƒ¨æ˜¯åªè¯»çš„码段类型
        if(hasAllReadOnlyType){
            List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
                secVO.setCodeValueApplyStatus(3);
                // æ—¥æœŸç æ®µè®¾ç½®é»˜è®¤å€¼
                if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
                    try {
                        secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
                    }catch (Exception e){
                        throw new ServiceException("日期码段日期格式配置有误，导致转换出错："+e.getMessage());
                    }
                }
                return secVO;
            }).collect(Collectors.toList());
            codeRuleVO.setSecVOList(basicSecVOS);
            return codeRuleVO;
        }
        // æƒ…况二 å…¨éƒ¨éƒ½æ˜¯å¯è¾“入类型的
        boolean hasAllInputType = secTypeList.stream().allMatch(item -> inputTypes.stream().anyMatch(item1-> item.equals(item1)));
        if(hasAllInputType){
            List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
                secVO.setCodeValueApplyStatus(1);
                // æ—¥æœŸç æ®µè®¾ç½®é»˜è®¤å€¼
                if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
                    try {
                        secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
                    }catch (Exception e){
                        throw new ServiceException("日期码段日期格式配置有误，导致转换出错："+e.getMessage());
                    }
                }
                return secVO;
            }).collect(Collectors.toList());
            codeRuleVO.setSecVOList(basicSecVOS);
            return codeRuleVO;
        }
        // æƒ…况三包含人为选择的码段，又有只读类型码段的，所有码段都要显示出来，可输设置为1，只读设置为2，隐藏设置为3
        List<CodeBasicSecVO> basicSecVOS = codeRuleVO.getSecVOList().stream().map(secVO -> {
            if(inputTypes.contains(secVO.getSecType())){
                secVO.setCodeValueApplyStatus(1);
            }else if(readOnlyTypes.contains(secVO.getSecType())){
                secVO.setCodeValueApplyStatus(2);
            }else{
                secVO.setCodeValueApplyStatus(3);
            }
            // æ—¥æœŸç æ®µè®¾ç½®é»˜è®¤å€¼
            if (secVO.getSecType().equals(CodeSecTypeEnum.CODE_DATE_SEC.getValue())) {
                try {
                    secVO.setCodeDateFormatStr(Func.format(new Date(),secVO.getCodeDateFormatStr()));
                }catch (Exception e){
                    throw new ServiceException("日期码段日期格式配置有误，导致转换出错："+e.getMessage());
                }
            }
            return secVO;
        }).collect(Collectors.toList());
        codeRuleVO.setSecVOList(basicSecVOS);
        return codeRuleVO;
    }

    /**

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

@@ -8,11 +8,6 @@

    <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-code/src/main/resources/mapper/CodeCLassifyMapper.xml

@@ -45,9 +45,9 @@
    </sql>

    <select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
        select * from PL_CODE_CLASSIFY where is_deleted = 0
        select * from PL_CODE_CLASSIFY where
        <if test="tenantId != null and tenantId != ''">
            and tenant_id = #{tenantId}
            tenant_id = #{tenantId}
        </if>
    </select>

@@ -241,7 +241,6 @@
                        SYS_CONNECT_BY_PATH(id, '#')   as paths
                    </otherwise>
                </choose>

        from pl_code_classify  plcodeclassify
                  START WITH parentCodeClassifyOid is null
              CONNECT BY PRIOR OID = parentCodeClassifyOid) codeclassify0
@@ -363,7 +362,6 @@
        <if test="parentOid == null or parentOid == ''">
            and codeclassify0.parentcodeclassifyoid is null
        </if>

        <if test="tenantId != null and tenantId != ''">
            and codeclassify0.tenant_id = #{tenantId}
        </if>
@@ -450,7 +448,6 @@
        <if test="desc != null">
            and  codeclassify0.DESCRIPTION = #{desc}
        </if>

        <if test="tenantId != null and tenantId != ''">
          and  codeclassify0.tenant_id = #{tenantId}
        </if>

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

@@ -109,7 +109,6 @@
        <foreach collection="secOids" index="index" item="item" open="(" close=")" separator=",">
            #{item}
        </foreach>

    </select>



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

@@ -147,8 +147,8 @@
                                   PCS.TEMPLET,
                                   PCS.ISQUERY
                               FROM PL_CODE_REFERCONFIG PCR
                                        LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
                               temp WHERE temp.REFERCONFIGOID = #{oid}
                LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID
        )temp WHERE temp.REFERCONFIGOID = #{oid}
    </select>

    <select id="selectSrchCondByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeSrchCondConfig">

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

@@ -35,7 +35,7 @@


    <select id="selectCodeTempphasePage" resultMap="CodeTempphaseResultMap">
        select * from PL_CODE_TEMPPHASE where is_deleted = 0
        select * from PL_CODE_TEMPPHASE
    </select>



 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.common.cache.NacosConfigCache;
import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.entity.Strategy;
import com.vci.ubcs.system.mapper.StrategyMapper;
import com.vci.ubcs.system.service.IStrategyService;