From c63a72a68bc6739f3617a00bc15a187b59f06bae Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 15 十月 2024 15:53:21 +0800
Subject: [PATCH] 1、解决引入milo-spring-boot-starter依赖系统无法启动异常 2、opc服务可配置开关服务,避免无opc环境下系统启动报错 3、删除无用的opc代码
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
index cb6da80..f752b45 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
@@ -33,15 +33,19 @@
@ApiOperation("鏂板瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
@PostMapping("/saveRole")
// @PreAuthorize("hasAuthority('sys:role:save')")
- public Result<SysRole> saveRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
- return Result.success(sysRoleService.saveRole(sysRoleVO));
+ public Result<SysRoleVO> saveRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
+ //return Result.success(sysRoleService.saveRole(sysRoleVO));
+ sysRoleService.saveRole(sysRoleVO);
+ return Result.build(200,"鏂板鎴愬姛",sysRoleVO);
}
@ApiOperation("缂栬緫瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
@PostMapping("/updateRole")
// @PreAuthorize("hasAuthority('sys:role:save')")
- public Result<String> updateRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
- return Result.success(sysRoleService.updateRole(sysRoleVO));
+ public Result<SysRoleVO> updateRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
+ // return Result.success(sysRoleService.updateRole(sysRoleVO));
+ sysRoleService.updateRole(sysRoleVO);
+ return Result.build(200,"鏂板鎴愬姛",sysRoleVO);
}
@ApiOperation("鏌ヨ瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
@@ -57,7 +61,7 @@
// @PreAuthorize("hasAuthority('sys:role:delete')")
@Transactional
public Result<String> deleteRole(@RequestBody List<Long> ids) {
- return Result.success(sysRoleService.deleteRole(ids));
+ return Result.build(200,"鍒犻櫎鎴愬姛",sysRoleService.deleteRole(ids));
}
}
\ No newline at end of file
--
Gitblit v1.8.0