From 9f9f7637f0cfd99497d2a5457089c7e92951a426 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 24 十一月 2023 14:46:34 +0800 Subject: [PATCH] 本地日志文件下载工具类中的方法修改,sql拼接错误修改 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java index 08d3bb8..fd8b3a2 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java @@ -16,18 +16,12 @@ */ package com.vci.ubcs.code.wrapper; -import com.vci.ubcs.code.entity.CodeButtonEntity; -import com.vci.ubcs.code.vo.CodeButtonVO; -import com.vci.ubcs.system.cache.DictBizCache; +import com.vci.ubcs.starter.web.util.BeanUtilForVCI; import com.vci.ubcs.system.cache.DictCache; -import com.vci.ubcs.system.enums.DictEnum; +import com.vci.ubcs.code.entity.CodeButton; +import com.vci.ubcs.code.vo.pagemodel.CodeButtonVO; import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.redis.cache.BladeRedis; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.core.tool.utils.Func; -import org.springframework.boot.autoconfigure.security.SecurityProperties; -import java.util.List; import java.util.Objects; /** @@ -36,17 +30,19 @@ * @author yuxc * @since 2023-03-29 */ -public class CodeButtonWrapper extends BaseEntityWrapper<CodeButtonEntity, CodeButtonVO> { +public class CodeButtonWrapper extends BaseEntityWrapper<CodeButton, CodeButtonVO> { public static CodeButtonWrapper build() { return new CodeButtonWrapper(); } @Override - public CodeButtonVO entityVO(CodeButtonEntity codebutton) { - CodeButtonVO codebuttonVO = Objects.requireNonNull(BeanUtil.copy(codebutton, CodeButtonVO.class)); - codebuttonVO.setUsedpositiontypeName(DictBizCache.getValue("codeButtonPosition", codebutton.getUsedpositiontype())); - codebuttonVO.setLcstatusName(DictBizCache.getValue("codeLcstatus", codebutton.getLcstatus())); + public CodeButtonVO entityVO(CodeButton codebutton) { + CodeButtonVO codebuttonVO = new CodeButtonVO(); + BeanUtilForVCI.copyPropertiesIgnoreCase(codebutton,codebuttonVO); + Objects.requireNonNull(codebuttonVO); + codebuttonVO.setUsedpositiontypeText(DictCache.getValue("codeButtonPosition", codebutton.getUsedPositionType())); + codebuttonVO.setLcStatusText(DictCache.getValue("codeLcstatus", codebutton.getLcStatus())); return codebuttonVO; } -- Gitblit v1.9.3