From 485f813f00da83b5aaa3f1ac7a43c704b260c06c Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 28 十月 2024 15:27:12 +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 |   90 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 82 insertions(+), 8 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 8f42517..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
@@ -1,8 +1,13 @@
 package com.vci.web.controller;
 
 import com.vci.constant.FrameWorkLangCodeConstant;
+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;
@@ -24,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.*;
 
 /**
  * 棣栭〉绯荤粺妯″潡閰嶇疆鎺у埗鍣�
@@ -72,20 +75,75 @@
         }
     }
 
-
     /**
      * 鑾峰彇褰撳墠妯″潡涓嬬殑瀛愭ā鍧�
-     * @param parentId
-     * @param modeType
      * @return
      */
     @GetMapping("/getSysModelAuthTreeMenuByPID")
-    public BaseResult<List<MenuVO>> getSysModelAuthTreeMenuByPID(String parentId, String modeType) {
+    public BaseResult<List<MenuVO>> getSysModelAuthTreeMenuByPID() {
         try {
-            return BaseResult.dataList(functionQueryService.getSysModelAuthTreeMenuByPID(parentId,modeType,true));
+            return BaseResult.dataList(functionQueryService.getSysModelAuthTreeMenuByPID(false));
         }catch (Exception e){
             e.printStackTrace();
             String errorMsg = "鏌ヨ瀛愭ā鍧楁椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
+    }
+
+    /**
+     * 鑾峰彇鎵�鎺堟潈鐨勬ā鍧楁潈闄�
+     * @param roleId 瑙掕壊
+     * @return
+     */
+    @GetMapping("/getSysModelAuth")
+    public BaseResult<List<String>> getSysModelAuth(String roleId) {
+        try {
+            return BaseResult.dataList(functionQueryService.getSysModelAuth(roleId));
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "鏌ヨ瀛愭ā鍧楁椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
+    }
+
+    /**
+     * 瑙掕壊鍒楄〃
+     * @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 roleDto 鐢ㄦ埛閫夋嫨鎺堟潈妯″潡淇℃伅
+     * @return 鎺堟潈缁撴灉
+     * @throws PLException
+     */
+    @PostMapping("/saveRoleRight")
+    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();
+            String errorMsg = "淇濆瓨妯″潡鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
             logger.error(errorMsg);
             throw new VciBaseException(errorMsg);
         }
@@ -451,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