From d1099b48aecf383fcefbe7b5a7ac3c2de0f0793f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:22:03 +0800
Subject: [PATCH] 1、卧理进出片功能已完成开发，与电气调试中，新增磨边队列表 2、卧理新增历史任务表，记录卧理两台设备执行过的历史数据 3、大理片笼opc任务，新增玻璃进笼计算方式：在笼内存储同炉的多片玻璃，笼内玻璃顺序可不按照固定的顺序进笼 4、上片任务初步完成开发，新增历史任务表记录上片的历史信息
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 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 943ff7d..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
@@ -1,20 +1,67 @@
package com.mes.role.controller;
+import com.mes.entity.request.GeneralRequest;
+import com.mes.role.entity.SysRole;
+import com.mes.role.entity.vo.SysRoleVO;
+import com.mes.role.service.SysRoleService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
- * <p>
- * 瑙掕壊琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
* @author zhoush
* @since 2024-04-11
*/
+@Api(description = "瑙掕壊绠＄悊")
@RestController
-@RequestMapping("/role/sys-role")
+@RequestMapping("/sys/role")
public class SysRoleController {
-}
+ @Autowired
+ private SysRoleService sysRoleService;
+ @ApiOperation("鏂板瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
+ @PostMapping("/saveRole")
+// @PreAuthorize("hasAuthority('sys:role:save')")
+ 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<SysRoleVO> updateRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
+ // return Result.success(sysRoleService.updateRole(sysRoleVO));
+ sysRoleService.updateRole(sysRoleVO);
+ return Result.build(200,"鏂板鎴愬姛",sysRoleVO);
+ }
+
+ @ApiOperation("鏌ヨ瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
+ @PostMapping("/queryRole")
+// @PreAuthorize("hasAuthority('sys:role:save')")
+ public Result<List<SysRoleVO>> queryRole(@Validated @RequestBody GeneralRequest request) {
+ return Result.success(sysRoleService.queryRole(request));
+ }
+
+
+ @ApiOperation("鍒犻櫎瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
+ @PostMapping("/delete")
+// @PreAuthorize("hasAuthority('sys:role:delete')")
+ @Transactional
+ public Result<String> deleteRole(@RequestBody List<Long> ids) {
+ return Result.build(200,"鍒犻櫎鎴愬姛",sysRoleService.deleteRole(ids));
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.8.0