From e9b405657b6117a8dcfcf8505cfd5d6eccd39cc8 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 30 五月 2023 18:32:57 +0800 Subject: [PATCH] code服务中部分do转vo时显示值转换改为缓存中拿值 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java index 9864da5..c58fd2e 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeBasicSecWrapper.java @@ -17,12 +17,15 @@ * Author: Chill 搴勯獮 (smallchill@163.com) */ +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.vci.ubcs.code.entity.CodeBasicSec; -import com.vci.ubcs.code.enumpack.*; import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO; +import com.vci.ubcs.omd.cache.EnumCache; +import com.vci.ubcs.omd.enums.EnumEnum; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; +import javax.annotation.Resource; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -40,15 +43,23 @@ } @Override - public CodeBasicSecVO entityVO(CodeBasicSec codeBasicSec) { - CodeBasicSecVO codeBasicSecVO = Objects.requireNonNull(BeanUtil.copy(codeBasicSec, CodeBasicSecVO.class)); - - //codeBasicSecVO.setLcStatusText(CodeRuleLC.getTextByValue(codeBasicSec.getLcStatus())); - codeBasicSecVO.setSecTypeText(CodeSecTypeEnum.getTextByValue(codeBasicSec.getSecType())); - codeBasicSecVO.setCodeLevelTypeText(CodeLevelTypeEnum.getTextByValue(codeBasicSec.getCodeLevelType())); - codeBasicSecVO.setCodeSecLengthTypeText(CodeSecLengthTypeEnum.getTextByValue(codeBasicSec.getCodeSecLengthType())); - codeBasicSecVO.setValueCutTypeText(CodeCutTypeEnum.getValueByText(codeBasicSec.getValueCutType())); - codeBasicSecVO.setCodeGetValueTypeText(CodeGetValueTypeEnum.getValueByText(codeBasicSec.getCodeGetValueType())); + public CodeBasicSecVO entityVO(CodeBasicSec codeBasicSecDO) { + CodeBasicSecVO codeBasicSecVO = Objects.requireNonNull(BeanUtil.copy(codeBasicSecDO, CodeBasicSecVO.class)); + if(StringUtils.isNotBlank(codeBasicSecDO.getSecType())){ + codeBasicSecVO.setSecTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_TYPE,codeBasicSecDO.getSecType())); + } + if(StringUtils.isNotBlank(codeBasicSecDO.getCodeLevelType())){ + codeBasicSecVO.setCodeLevelTypeText(EnumCache.getValue(EnumEnum.CODE_LEVEL_TYPE,codeBasicSecDO.getCodeLevelType())); + } + if(StringUtils.isNotBlank(codeBasicSecDO.getCodeSecLengthType())){ + codeBasicSecVO.setCodeSecLengthTypeText(EnumCache.getValue(EnumEnum.CODE_SEC_LENGTH,codeBasicSecDO.getCodeSecLengthType())); + } + if(StringUtils.isNotBlank(codeBasicSecDO.getValueCutType())){ + codeBasicSecVO.setValueCutTypeText(EnumCache.getValue(EnumEnum.CODE_CUT_TYPE,codeBasicSecDO.getValueCutType())); + } + if(StringUtils.isNotBlank(codeBasicSecDO.getCodeGetValueType())){ + codeBasicSecVO.setCodeGetValueTypeText(EnumCache.getValue(EnumEnum.CODE_GET_VALUE_TYPE,codeBasicSecDO.getCodeGetValueType())); + } //codeBasicSecVO.setParentClassifySecText(); //codeBasicSecVO.setSecretGradeText(); return codeBasicSecVO; -- Gitblit v1.9.3