From 20159916dd5f3a89b97a9ba83bed37b841471921 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 24 七月 2024 12:43:58 +0800
Subject: [PATCH] 上片模块：上片模块对接完成，命令可正常写入 上片逻辑：复位后需要向plc发送联动请求，联动请求为1后可接收到上片机发送的上片请求，否则无法执行上片任务
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 036e737..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("鏌ヨ瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
--
Gitblit v1.8.0