From b4323fbf5258f682a10fa76abe3a68d0644c90d4 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@vci-tech.com>
Date: 星期一, 30 十二月 2024 11:00:54 +0800
Subject: [PATCH] 在线人员功能调整
---
/dev/null | 94 -------------------------------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java | 11 ++-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java | 14 ++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/HMSysModConfigController.java | 18 ++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebIconController.java | 2
5 files changed, 41 insertions(+), 98 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/config/ConfigCorbaReader.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/config/ConfigCorbaReader.java
deleted file mode 100644
index 4c13af3..0000000
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/config/ConfigCorbaReader.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.vci.web.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-/**
- * corba閰嶇疆鏂囦欢璇诲彇
- * @author ludc
- * @date 2024/6/28 23:11
- */
-public class ConfigCorbaReader {
-
- private static Properties properties;
-
- static {
- properties = new Properties();
- try (InputStream input = ConfigCorbaReader.class.getClassLoader().getResourceAsStream("properties/corba.properties")) {
- if (input == null) {
- System.err.println("Unable to find corba.properties");
- } else {
- properties.load(input);
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public static String getConfigValue(String key) {
- return properties.getProperty(key);
- }
-
-}
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 e3cb02f..b2a4fd5 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
@@ -3,6 +3,7 @@
import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.FuncOperationInfo;
+import com.vci.corba.framework.data.OnlinUserInfo;
import com.vci.corba.framework.data.OperateInfo;
import com.vci.dto.RoleInfoDTO;
import com.vci.dto.RoleRightParamDTO;
@@ -524,4 +525,21 @@
}
}
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛鍦ㄧ嚎浜烘暟
+ * @return
+ */
+ @GetMapping("/getOnlinUsers")
+ public BaseResult<OnlinUserInfo> getOnlinUsers(){
+ try {
+ BaseResult baseResult = BaseResult.success();
+ List<OnlinUserInfo> onlineUserList = hmSysModConfigService.getOnlinUsers();
+ baseResult.setData(onlineUserList);
+ return baseResult;
+ } catch (Exception e) {
+ String errorMsg = "鑾峰彇褰撳墠鍦ㄧ嚎鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebIconController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebIconController.java
index a700a6b..ee1d2fb 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebIconController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebIconController.java
@@ -4,6 +4,7 @@
import com.vci.dto.PLIconDTO;
import com.vci.pagemodel.PLIconGroupVO;
import com.vci.pagemodel.PLIconVO;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -148,6 +149,7 @@
* @param baseQueryObject 鏌ヨ瀵硅薄
* @return 鍥炬爣淇℃伅
*/
+ @VciUnCheckRight
@VciBusinessLog(operateName = "鑾峰彇鎵�鏈夊浘鏍�", description = "鑾峰彇鎵�鏈夊浘鏍�")
@GetMapping("/getAllIcon")
public BaseResult<PLIconGroupVO> getAllIcon(BaseQueryObject baseQueryObject){
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/data.s.json b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/data.s.json
deleted file mode 100644
index 57196ad..0000000
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/data.s.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "code": 200,
- "data": null,
- "exceptionClassName": null,
- "exceptionCode": null,
- "exceptionObjs": null,
- "finishTime": 1726130668800,
- "msg": "",
- "msgObjs": null,
- "obj": null,
- "requestTraceId": null,
- "success": true,
- "total": 0,
- "traceId": "71bfe687-1112-47c3-9fe5-45ae9f7b7228",
- "treeData": [
- {
- "attributes": {},
- "checked": false,
- "children": [
- {
- "attributes": {},
- "checked": false,
- "children": [],
- "data": "user",
- "expanded": false,
- "href": null,
- "icon": null,
- "iconCls": null,
- "index": null,
- "leaf": false,
- "level": 0,
- "oid": "user",
- "parentBtmName": "user",
- "parentId": null,
- "parentName": null,
- "showCheckbox": false,
- "text": "鐢ㄦ埛"
- },
- {
- "attributes": {},
- "checked": false,
- "children": [],
- "data": "department",
- "expanded": false,
- "href": null,
- "icon": null,
- "iconCls": null,
- "index": null,
- "leaf": false,
- "level": 0,
- "oid": "department",
- "parentBtmName": "department",
- "parentId": null,
- "parentName": null,
- "showCheckbox": false,
- "text": "閮ㄩ棬"
- },
- {
- "attributes": {},
- "checked": false,
- "children": [],
- "data": "role",
- "expanded": false,
- "href": null,
- "icon": null,
- "iconCls": null,
- "index": null,
- "leaf": false,
- "level": 0,
- "oid": "role",
- "parentBtmName": "role",
- "parentId": null,
- "parentName": null,
- "showCheckbox": false,
- "text": "瑙掕壊"
- }
- ],
- "data": "root",
- "expanded": true,
- "href": null,
- "icon": null,
- "iconCls": null,
- "index": null,
- "leaf": false,
- "level": 0,
- "oid": "root",
- "parentBtmName": "root",
- "parentId": null,
- "parentName": null,
- "showCheckbox": false,
- "text": "浜哄憳缁勭粐"
- }
- ]
-}
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
index 2e33f82..fddc439 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/SmHMSysModConfigServiceI.java
@@ -2,10 +2,7 @@
import com.vci.common.exception.VciException;
import com.vci.corba.common.PLException;
-import com.vci.corba.framework.data.AppConfigCategoryInfo;
-import com.vci.corba.framework.data.AppConfigDetailInfo;
-import com.vci.corba.framework.data.FuncOperationInfo;
-import com.vci.corba.framework.data.OperateInfo;
+import com.vci.corba.framework.data.*;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
import com.vci.starter.web.exception.VciBaseException;
@@ -164,4 +161,10 @@
*/
long getOnlineUsersNum();
+ /**
+ * 鑾峰彇鍦ㄧ嚎浜哄憳
+ * @return
+ */
+ List<OnlinUserInfo> getOnlinUsers();
+
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
index 4d48b37..e9d22d8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmHMSysModConfigServiceImpl.java
@@ -1613,4 +1613,18 @@
}
+ /**
+ * 鑾峰彇鍦ㄧ嚎浜哄憳
+ *
+ * @return
+ */
+ @Override
+ public List<OnlinUserInfo> getOnlinUsers() {
+ try {
+ OnlinUserInfo[] onlinUserInfos = platformClientUtil.getFrameworkService().getOnlineUsers();
+ return Arrays.asList(onlinUserInfos);
+ } catch (PLException e) {
+ throw new VciBaseException(String.valueOf(e.code), e.messages);
+ }
+ }
}
--
Gitblit v1.9.3