From c90093511d4f535fbae53633313c538d1d7a2275 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 28 十月 2024 15:01:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
index 858f465..07c2980 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java
@@ -4,8 +4,10 @@
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.FuncOperationInfo;
import com.vci.corba.framework.data.OperateInfo;
+import com.vci.dto.RoleInfoDTO;
import com.vci.dto.RoleRightDTO;
import com.vci.dto.RoleRightParamDTO;
+import com.vci.dto.RoleRightParamDTOS;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.compatibility.SmHMSysModConfigServiceI;
import com.vci.pagemodel.AppConfigDetailInfoVO;
@@ -27,9 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
/**
* 棣栭〉绯荤粺妯″潡閰嶇疆鎺у埗鍣�
@@ -75,7 +75,6 @@
}
}
-
/**
* 鑾峰彇褰撳墠妯″潡涓嬬殑瀛愭ā鍧�
* @return
@@ -110,15 +109,37 @@
}
/**
+ * 瑙掕壊鍒楄〃
+ * @param roleName 鎼滅储鐨勮鑹�
+ * @return 瑙掕壊鍒楄〃
+ */
+ @GetMapping("/getRoleList")
+ public BaseResult<List<RoleInfoDTO>> getRoleList(String roleName) {
+ try {
+ return BaseResult.dataList(functionQueryService.getRoleList(roleName));
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
* 淇濆瓨鎺堟潈鐨勬ā鍧�
- * @param roleRightDTOS 鐢ㄦ埛閫夋嫨鎺堟潈妯″潡淇℃伅
- * @param roleId 瑙掕壊涓婚敭
+ * @param roleDto 鐢ㄦ埛閫夋嫨鎺堟潈妯″潡淇℃伅
* @return 鎺堟潈缁撴灉
* @throws PLException
*/
@PostMapping("/saveRoleRight")
- public BaseResult<List<String>> saveRoleRight(@RequestBody List<RoleRightParamDTO> roleRightDTOS, String roleId) {
+ public BaseResult saveRoleRight(@RequestBody RoleRightParamDTOS roleDto) {
try {
+
+ ArrayList<RoleRightParamDTO> roleRightDTOS = roleDto.getRoleData();
+ String roleId = roleDto.getRoleId();
+ if(StringUtils.isBlank(roleId)){
+ return BaseResult.fail("璇烽�夋嫨瑙掕壊锛�");
+ }
return functionQueryService.saveRoleRight(roleRightDTOS, roleId);
}catch (Exception e){
e.printStackTrace();
@@ -488,4 +509,20 @@
}
}
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛鍦ㄧ嚎浜烘暟
+ * @return
+ */
+ @GetMapping("/getOnlineUsersNum")
+ public BaseResult getOnlineUsersNum() {
+ try {
+ long onlineUsersNum = hmSysModConfigService.getOnlineUsersNum();
+ return BaseResult.success(onlineUsersNum);
+ } catch (Exception e) {
+ String errorMsg = "鑾峰彇褰撳墠鐢ㄦ埛鍦ㄧ嚎浜烘暟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
}
--
Gitblit v1.9.3