From 9c67a9d48ec6a71e2d4edf11fae3f5e802a97bff Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期二, 19 十一月 2024 16:35:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmHMSysModConfigServiceImpl.java | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 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 bd566c1..4b62737 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,12 +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.starter.web.redis.RedisService; import com.vci.web.util.Func; import com.vci.web.util.PlatformClientUtil; import org.slf4j.Logger; @@ -45,13 +47,22 @@ private int count = 0; + /** + * 鍖呭惈淇濆瓨妯″潡鏂规硶绛夋搷浣滅被 + */ private static FunctionOperateDelegate foDelegate; + /** + * 鍒濆鍖杅oDelegate + */ { if(Func.isEmpty(foDelegate)){ foDelegate = new FunctionOperateDelegate(); } } + + @Autowired + private RedisService redisService; /** * 鏃ュ織 @@ -105,8 +116,8 @@ res = foDelegate.updateMod(menuVO); /** * 杩斿洖锛�1琛ㄧず妯″潡鍚嶉噸澶嶃�� - * 2琛ㄧず妯″潡鏍囪瘑閲嶅銆� - * 3鏍囩ず妯″潡鍒悕閲嶅銆� + * 2琛ㄧず妯″潡鏍囪瘑閲嶅銆� + * 3鏍囩ず妯″潡鍒悕閲嶅銆� */ if(res.equals("1")){ throw new VciBaseException("妯″潡鍚嶇О閲嶅锛岃淇敼锛�"); @@ -773,6 +784,16 @@ } /** + * 鑾峰彇褰撳墠鍦ㄧ嚎浜烘暟 + * @return + */ + @Override + public long getOnlineUsersNum() { + long currentLoggedUserCount = redisService.getCurrentOnlineUserCount(VConstant.CURRENT_LOGGED_USERS_KEY); + return currentLoggedUserCount; + } + + /** * 鏀堕泦琛ㄥ崟淇℃伅銆� * @param files * @return @@ -1225,6 +1246,7 @@ info.desc = object.getRemark() == null ? "" : object.getRemark(); info.seq = object.getSort(); info.image = object.getSource() == null ? "" : object.getSource(); + info.functionType = object.getFunctionType(); info.isValid = object.getIsValid(); info.aliasName = object.getAlias() == null ? "" : object.getAlias(); info.resourceDotNet = object.getResourceDotNet() == null ? "" : object.getResourceDotNet(); @@ -1292,7 +1314,8 @@ obj.suffixB = "";*/ obj.seq = sequence; obj.image = menuVO.getSource(); - obj.isValid = Func.isNotEmpty(menuVO.getValid()) ? menuVO.getValid():false; + obj.functionType = menuVO.getFunctionType(); + obj.isValid = Func.isNotEmpty(menuVO.getIsValid()) ? menuVO.getIsValid():false; obj.aliasName = aliasName; obj.resourceDotNet = resDotNet; obj.resourceMobile = resMobile; @@ -1585,6 +1608,5 @@ } } - } -- Gitblit v1.9.3