From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +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 | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 b2a4fd5..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,11 +3,12 @@
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.OnlineUserInfo;
import com.vci.corba.framework.data.OperateInfo;
import com.vci.dto.RoleInfoDTO;
import com.vci.dto.RoleRightParamDTO;
import com.vci.dto.RoleRightParamDTOS;
+import com.vci.pagemodel.OperateVO;
import com.vci.web.service.ISmFunctionQueryService;
import com.vci.web.service.SmHMSysModConfigServiceI;
import com.vci.pagemodel.AppConfigDetailInfoVO;
@@ -253,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);
@@ -270,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);
@@ -529,11 +530,11 @@
* 鑾峰彇褰撳墠鐢ㄦ埛鍦ㄧ嚎浜烘暟
* @return
*/
- @GetMapping("/getOnlinUsers")
- public BaseResult<OnlinUserInfo> getOnlinUsers(){
+ @GetMapping("/getOnlineUsers")
+ public BaseResult<OnlineUserInfo> getOnlineUsers(){
try {
BaseResult baseResult = BaseResult.success();
- List<OnlinUserInfo> onlineUserList = hmSysModConfigService.getOnlinUsers();
+ List<OnlineUserInfo> onlineUserList = hmSysModConfigService.getOnlineUsers();
baseResult.setData(onlineUserList);
return baseResult;
} catch (Exception e) {
--
Gitblit v1.9.3