From 7d7b42822d9a11f8fa107fc3bbbbd518f0a7ef91 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期六, 09 十一月 2024 01:17:28 +0800 Subject: [PATCH] 1、修复系统功能模块-》管理功能模块修改是否有效功能修改无效问题。 2、Action管理,Action分类删除报错问题修改。 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java index 54c8d31..aea8786 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java @@ -12,13 +12,14 @@ import com.vci.starter.poi.bo.WriteExcelData; import com.vci.starter.poi.bo.WriteExcelOption; import com.vci.starter.poi.util.ExcelUtil; +import com.vci.starter.web.constant.VConstant; import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.pagemodel.BaseResult; import com.vci.starter.web.pagemodel.SessionInfo; import com.vci.starter.web.util.LocalFileUtil; import com.vci.starter.web.util.VciBaseUtil; import com.vci.starter.web.util.WebThreadLocalUtil; -import com.vci.web.redis.RedisService; +import com.vci.starter.web.redis.RedisService; import com.vci.web.util.Func; import com.vci.web.util.PlatformClientUtil; import org.slf4j.Logger; @@ -62,11 +63,6 @@ @Autowired private RedisService redisService; - - /** - * 褰撳墠鐧诲綍鐨勭敤鎴锋�绘暟key - */ - private static final String CURRENT_LOGGED_USERS_KEY = "current_logged_users"; /** * 鏃ュ織 @@ -609,8 +605,6 @@ return res; } - - /** * 妫�鏌ユ槸鍚﹀瓨鍦ㄥ紩鐢ㄥ叧绯� * @param ids @@ -795,7 +789,7 @@ */ @Override public long getOnlineUsersNum() { - long currentLoggedUserCount = redisService.getCurrentLoggedUserCount(CURRENT_LOGGED_USERS_KEY); + long currentLoggedUserCount = redisService.getCurrentOnlineUserCount(VConstant.CURRENT_LOGGED_USERS_KEY); return currentLoggedUserCount; } @@ -1251,7 +1245,7 @@ //info.suffixB = object.getSuffixB() == null ? "" : object.getSuffixB(); info.desc = object.getRemark() == null ? "" : object.getRemark(); info.seq = object.getSort(); - info.image = object.getSource() == null ? "" : object.getSource(); + info.icon = object.getSource() == null ? "" : object.getSource(); info.isValid = object.getIsValid(); info.aliasName = object.getAlias() == null ? "" : object.getAlias(); info.resourceDotNet = object.getResourceDotNet() == null ? "" : object.getResourceDotNet(); @@ -1318,8 +1312,8 @@ /*obj.suffixC = ""; obj.suffixB = "";*/ obj.seq = sequence; - obj.image = menuVO.getSource(); - obj.isValid = Func.isNotEmpty(menuVO.getValid()) ? menuVO.getValid():false; + obj.icon = menuVO.getSource(); + obj.isValid = Func.isNotEmpty(menuVO.getIsValid()) ? menuVO.getIsValid():false; obj.aliasName = aliasName; obj.resourceDotNet = resDotNet; obj.resourceMobile = resMobile; -- Gitblit v1.9.3