From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20: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 | 321 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 304 insertions(+), 17 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 966811e..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
@@ -1,20 +1,28 @@
package com.vci.web.controller;
import com.vci.constant.FrameWorkLangCodeConstant;
-import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
-import com.vci.frameworkcore.compatibility.SmHMSysModConfigServiceI;
+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.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;
+import com.vci.pagemodel.ExpExcelConditionVO;
import com.vci.pagemodel.MenuVO;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
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;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -22,9 +30,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.*;
/**
* 棣栭〉绯荤粺妯″潡閰嶇疆鎺у埗鍣�
@@ -33,7 +39,6 @@
*/
@RestController
@RequestMapping("/hmSysModConfigController")
-@VciUnCheckRight
public class HMSysModConfigController {
/**
@@ -72,6 +77,80 @@
}
/**
+ * 鑾峰彇褰撳墠妯″潡涓嬬殑瀛愭ā鍧�
+ * @return
+ */
+ @GetMapping("/getSysModelAuthTreeMenuByPID")
+ public BaseResult<List<MenuVO>> getSysModelAuthTreeMenuByPID() {
+ try {
+ 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);
+ }
+ }
+
+ /**
* 娣诲姞妯″潡
* @param menuVO
* @return
@@ -79,7 +158,7 @@
@PostMapping("/addModel")
public BaseResult addModel(@RequestBody MenuVO menuVO) {
try {
- return BaseResult.success(hmSysModConfigService.addModule(menuVO),"妯″潡澧炲姞鎴愬姛");
+ return BaseResult.success(hmSysModConfigService.addModule(menuVO),"妯″潡澧炲姞鎴愬姛!");
}catch (Exception e){
e.printStackTrace();
String errorMsg = "澧炲姞妯″潡鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
@@ -123,6 +202,23 @@
}
/**
+ * 鍒犻櫎妯″潡涓嬪叧鑱旂殑鎿嶄綔绫诲瀷
+ * @param funcOperationInfo
+ * @return
+ */
+ @DeleteMapping("/delFuncOperation")
+ public BaseResult delFuncOperation(@RequestBody FuncOperationInfo funcOperationInfo) {
+ try {
+ return BaseResult.success(hmSysModConfigService.delFuncOperation(funcOperationInfo),"妯″潡涓嬫搷浣滅被鍨嬪垹闄ゆ垚鍔�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "妯″潡涓嬫搷浣滅被鍨嬪垹闄ゆ椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
* 绠＄悊鍔熻兘妯″潡銆佷笟鍔″姛鑳芥ā鍧椾笅鐨勫彾瀛愯妭鐐光�斾慨鏀规搷浣滃埆鍚嶆帴鍙�
* @param menuVO
* @return
@@ -133,7 +229,24 @@
return BaseResult.success(hmSysModConfigService.updateAlias(menuVO),"鎿嶄綔鍒悕淇敼鎴愬姛");
}catch (Exception e){
e.printStackTrace();
- String errorMsg = "鎿嶄綔鍒悕淇敼鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ String errorMsg = "鎿嶄綔绫诲瀷鍒悕淇敼鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
+ * 娣诲姞鎿嶄綔绫诲瀷涓庢ā鍧楃殑鍏宠仈鍏崇郴
+ * @param funcOperationInfoList
+ * @return
+ */
+ @PostMapping("/addFuncOperationType")
+ public BaseResult addFuncOperationType(@RequestBody List<FuncOperationInfo> funcOperationInfoList) {
+ try {
+ return BaseResult.success(hmSysModConfigService.addFuncOperationType(funcOperationInfoList),"涓哄綋鍓嶆ā鍧楁坊鍔犳搷浣滅被鍨嬫垚鍔�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "涓哄綋鍓嶆ā鍧楁坊鍔犳搷浣滅被鍨嬫椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
logger.error(errorMsg);
throw new VciBaseException(errorMsg);
}
@@ -141,16 +254,50 @@
/**
* 娣诲姞鎿嶄綔绫诲瀷
- * @param menuVOList
+ * @param operateVO
* @return
*/
@PostMapping("/addOperationType")
- public BaseResult addOperationType(@RequestBody List<MenuVO> menuVOList) {
+ public BaseResult addOperationType(@RequestBody OperateVO operateVO) {
try {
- return BaseResult.success(hmSysModConfigService.addOperationType(menuVOList),"鎿嶄綔绫诲瀷娣诲姞鎴愬姛");
+ return BaseResult.success(hmSysModConfigService.addOperationType(operateVO),"娣诲姞鎿嶄綔绫诲瀷鎴愬姛");
}catch (Exception e){
e.printStackTrace();
- String errorMsg = "鍒犻櫎妯″潡鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ String errorMsg = "娣诲姞鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
+ * 淇敼鎿嶄綔绫诲瀷
+ * @param operateVO
+ * @return
+ */
+ @PutMapping("/updateOperationType")
+ public BaseResult updateOperationType(@RequestBody OperateVO operateVO) {
+ try {
+ return BaseResult.success(hmSysModConfigService.updateOperationType(operateVO),"淇敼鎿嶄綔绫诲瀷鎴愬姛");
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "淇敼鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
+ * 鍒犻櫎鎿嶄綔绫诲瀷
+ * @param operateInfo
+ * @return
+ */
+ @DeleteMapping("/delOperationType")
+ public BaseResult delOperationType(@RequestBody OperateInfo operateInfo) {
+ try {
+ return BaseResult.success(hmSysModConfigService.delOperationType(operateInfo),"鍒犻櫎鎿嶄綔绫诲瀷鎴愬姛");
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "鍒犻櫎鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
logger.error(errorMsg);
throw new VciBaseException(errorMsg);
}
@@ -234,7 +381,7 @@
* 瀵煎叆妯″潡
* @return
*/
- @GetMapping("/importModule")
+ @PostMapping("/importModule")
public BaseResult importModule(@RequestParam("files") List<MultipartFile> files) {
LinkedList<File> fileList = new LinkedList<>();
try {
@@ -244,7 +391,7 @@
file.transferTo(file1);
fileList.add(file1);
}
- if(Func.isEmpty(fileList)){
+ if(Func.isNotEmpty(fileList)){
return hmSysModConfigService.importModule(fileList);
} else {
return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"鏃犲鍏ョ殑鏂囦欢"});
@@ -256,4 +403,144 @@
}
}
+ /**
+ *鏌ヨ绯荤粺閰嶇疆鏍�
+ * @return
+ */
+ @GetMapping("/getAppConfigCategoryInfo")
+ public BaseResult getAppConfigCategoryInfo() {
+ try {
+ return BaseResult.dataList(hmSysModConfigService.getAppConfigCategoryInfo());
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "鏌ヨ绯荤粺閰嶇疆鍒楄〃鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
+ *鏍规嵁鍒嗙被ID杩斿洖鍏ㄩ儴鐨� AppConfigDetail 瀵硅薄
+ * @return
+ */
+ @GetMapping("/getAppConfigDetailsByID")
+ public BaseResult getAppConfigDetailsByID(String clsId) {
+ try {
+ return BaseResult.dataList(hmSysModConfigService.getAppConfigDetailsByID(clsId));
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "鏌ヨ閰嶇疆椤瑰垪琛ㄦ椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
+ * 娣诲姞鎿嶄綔绫诲瀷
+ * @param appConfigDetailInfoVO
+ * @return
+ */
+ @PostMapping("/addAppConf")
+ public BaseResult addAppConf(@RequestBody AppConfigDetailInfoVO appConfigDetailInfoVO) {
+ try {
+ boolean res = hmSysModConfigService.addAppConf(appConfigDetailInfoVO.getAppConfigDetailInfo(), appConfigDetailInfoVO.isConfCategorys());
+ return res ? BaseResult.success("娣诲姞鎿嶄綔绫诲瀷鎴愬姛"):BaseResult.fail("娣诲姞鎿嶄綔绫诲瀷澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "娣诲姞鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
+ * 淇敼鎿嶄綔绫诲瀷
+ * @param appConfigDetailInfoVO
+ * @return
+ */
+ @PutMapping("/updateAppConf")
+ public BaseResult updateAppConf(@RequestBody AppConfigDetailInfoVO appConfigDetailInfoVO) {
+ try {
+ boolean res = hmSysModConfigService.updateAppConf(appConfigDetailInfoVO.getAppConfigDetailInfo(),appConfigDetailInfoVO.isConfCategorys());
+ return res ? BaseResult.success("淇敼鎿嶄綔绫诲瀷鎴愬姛"):BaseResult.fail("淇敼鎿嶄綔绫诲瀷澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "淇敼鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
+ * 鍒犻櫎鎿嶄綔绫诲瀷
+ * @param ids
+ * @param isConfCategorys
+ * @return
+ */
+ @DeleteMapping("/delAppConf")
+ public BaseResult delAppConf(String[] ids,boolean isConfCategorys) {
+ try {
+ return hmSysModConfigService.delAppConf(ids,isConfCategorys) ? BaseResult.success("鍒犻櫎鎿嶄綔绫诲瀷鎴愬姛"):BaseResult.fail("鍒犻櫎鎿嶄綔绫诲瀷澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String errorMsg = "鍒犻櫎鎿嶄綔绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorMsg);
+ throw new VciBaseException(errorMsg);
+ }
+ }
+
+ /**
+ * 瀵煎嚭绯荤粺閰嶇疆(閰嶇疆椤瑰垎绫绘垨閰嶇疆椤�)
+ * @return
+ */
+ @PostMapping("/exportSysConf")
+ public void exportSysConf(@RequestBody ExpExcelConditionVO expExcelConditionVO, HttpServletResponse response) {
+ try {
+ String excelPath = hmSysModConfigService.exportSysConf(expExcelConditionVO,response);
+ ControllerUtil.writeFileToResponse(response,excelPath);
+ } catch (Exception e) {
+ String msg = "瀵煎嚭绯荤粺閰嶇疆鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ try {
+ //鍑洪敊鏃�
+ e.printStackTrace();
+ ControllerUtil.writeDataToResponse(response,"error_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss") + ".txt", StringUtils.isNotBlank(msg)?msg.getBytes():new byte[0],null);
+ } catch (IOException ioException) {
+ ioException.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛鍦ㄧ嚎浜烘暟
+ * @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);
+ }
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鐢ㄦ埛鍦ㄧ嚎浜烘暟
+ * @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