From 7938e5bedb3ff3b17dae51eb9588e8c8e71136c2 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 09 五月 2023 16:55:43 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeButtonWrapper.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 b82e17f..a516a4d 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,11 +16,14 @@
*/
package com.vci.ubcs.code.wrapper;
-import com.vci.ubcs.code.entity.CodeButtonEntity;
-import com.vci.ubcs.code.vo.CodeButtonVO;
-import com.vci.ubcs.omd.cache.DictCache;
+import com.vci.ubcs.system.cache.DictCache;
+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;
@@ -31,17 +34,17 @@
* @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) {
+ public CodeButtonVO entityVO(CodeButton codebutton) {
CodeButtonVO codebuttonVO = Objects.requireNonNull(BeanUtil.copy(codebutton, CodeButtonVO.class));
- codebuttonVO.setUsedpositiontypeName(DictCache.getValue("codeButtonPosition", codebutton.getUsedpositiontype()));
- codebuttonVO.setLcstatusName(DictCache.getValue("codeLcstatus", codebutton.getLcstatus()));
+ codebuttonVO.setUsedpositiontypeText(DictCache.getValue("codeButtonPosition", codebutton.getUsedpositiontype()));
+ codebuttonVO.setLcStatusText(DictCache.getValue("codeLcstatus", codebutton.getLcstatus()));
return codebuttonVO;
}
--
Gitblit v1.9.3