From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +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 | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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 a7acfa1..feedbf5 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,13 +3,14 @@
import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.corba.common.PLException;
import com.vci.corba.framework.data.FuncOperationInfo;
+import com.vci.corba.framework.data.OnlineUserInfo;
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.OperateVO;
+import com.vci.web.service.ISmFunctionQueryService;
+import com.vci.web.service.SmHMSysModConfigServiceI;
import com.vci.pagemodel.AppConfigDetailInfoVO;
import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
@@ -18,7 +19,7 @@
import com.vci.starter.web.util.ControllerUtil;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.util.Func;
+import com.vci.starter.web.util.Lcm.Func;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +75,6 @@
throw new VciBaseException(errorMsg);
}
}
-
/**
* 鑾峰彇褰撳墠妯″潡涓嬬殑瀛愭ā鍧�
@@ -254,13 +254,13 @@
/**
* 娣诲姞鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@PostMapping("/addOperationType")
- public BaseResult addOperationType(@RequestBody OperateInfo operateInfo) {
+ public BaseResult addOperationType(@RequestBody OperateVO operateVO) {
try {
- return BaseResult.success(hmSysModConfigService.addOperationType(operateInfo),"娣诲姞鎿嶄綔绫诲瀷鎴愬姛");
+ return BaseResult.success(hmSysModConfigService.addOperationType(operateVO),"娣诲姞鎿嶄綔绫诲瀷鎴愬姛");
}catch (Exception e){
e.printStackTrace();
String errorMsg = "娣诲姞鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
@@ -271,13 +271,13 @@
/**
* 淇敼鎿嶄綔绫诲瀷
- * @param operateInfo
+ * @param operateVO
* @return
*/
@PutMapping("/updateOperationType")
- public BaseResult updateOperationType(@RequestBody OperateInfo operateInfo) {
+ public BaseResult updateOperationType(@RequestBody OperateVO operateVO) {
try {
- return BaseResult.success(hmSysModConfigService.updateOperationType(operateInfo),"淇敼鎿嶄綔绫诲瀷鎴愬姛");
+ return BaseResult.success(hmSysModConfigService.updateOperationType(operateVO),"淇敼鎿嶄綔绫诲瀷鎴愬姛");
}catch (Exception e){
e.printStackTrace();
String errorMsg = "淇敼鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
@@ -526,4 +526,21 @@
}
}
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛鍦ㄧ嚎浜烘暟
+ * @return
+ */
+ @GetMapping("/getOnlineUsers")
+ public BaseResult<OnlineUserInfo> getOnlineUsers(){
+ try {
+ BaseResult baseResult = BaseResult.success();
+ List<OnlineUserInfo> onlineUserList = hmSysModConfigService.getOnlineUsers();
+ baseResult.setData(onlineUserList);
+ return baseResult;
+ } catch (Exception e) {
+ String errorMsg = "鑾峰彇褰撳墠鍦ㄧ嚎鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
}
--
Gitblit v1.9.3