From 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 18:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
index fe0f82e..429286e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
@@ -33,14 +33,14 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- //@RequiresPermissions("business:devicerole:create")
+ @RequiresPermissions("business:devicerole:create")
public ApiResponse create(@RequestBody DeviceRole deviceRole) {
return ApiResponse.success(deviceRoleService.create(deviceRole));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- //@RequiresPermissions("business:devicerole:delete")
+ @RequiresPermissions("business:devicerole:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
deviceRoleService.deleteById(id);
return ApiResponse.success(null);
@@ -48,7 +48,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- //@RequiresPermissions("business:devicerole:delete")
+ @RequiresPermissions("business:devicerole:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -61,7 +61,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- //@RequiresPermissions("business:devicerole:update")
+ @RequiresPermissions("business:devicerole:update")
public ApiResponse updateById(@RequestBody DeviceRole deviceRole) {
deviceRoleService.updateById(deviceRole);
return ApiResponse.success(null);
@@ -69,22 +69,28 @@
@ApiOperation("鏍规嵁ID淇敼榛樿闂ㄧ缁勭姸鎬�")
@PostMapping("/updateStatusById")
- //@RequiresPermissions("business:devicerole:update")
+ @RequiresPermissions("business:devicerole:update")
public ApiResponse updateStatusById(@RequestBody DeviceRole deviceRole) {
deviceRoleService.updateStatusById(deviceRole);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("榛樿涓嬪彂闂ㄧ缁勮鑹�")
+ @PostMapping("/updateMemberRole")
+ public ApiResponse updateMemberRole(@RequestBody DeviceRole deviceRole) {
+ deviceRoleService.updateMemberRole(deviceRole);
return ApiResponse.success(null);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- //@RequiresPermissions("business:devicerole:query")
+ @RequiresPermissions("business:devicerole:query")
public ApiResponse<PageData<DeviceRole>> findPage (@RequestBody PageWrap<DeviceRole> pageWrap) {
return ApiResponse.success(deviceRoleService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- //@RequiresPermissions("business:devicerole:exportExcel")
+ @RequiresPermissions("business:devicerole:exportExcel")
public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response) {
ExcelExporter.build(DeviceRole.class).export(deviceRoleService.findPage(pageWrap).getRecords(), "闂ㄧ瑙掕壊淇℃伅琛�", response);
}
--
Gitblit v1.9.3