From 48b4e46f22ec83843cb8a3087b8ec9511a7ea8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 10:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java
index e00853b..5638e29 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/DeviceRoleCloudController.java
@@ -34,14 +34,15 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("business:devicerole:create")
-    public ApiResponse create(@RequestBody DeviceRole deviceRole) {
+    public ApiResponse create(@RequestBody DeviceRole deviceRole,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        deviceRole.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(deviceRoleService.create(deviceRole));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:devicerole:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
+    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         deviceRoleService.deleteById(id);
         return ApiResponse.success(null);
     }
@@ -49,10 +50,10 @@
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
     @CloudRequiredPermission("business:devicerole:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
+        for (String id : idArray){
             idList.add(Integer.valueOf(id));
         }
         deviceRoleService.deleteByIdInBatch(idList);
@@ -62,7 +63,9 @@
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:devicerole:update")
-    public ApiResponse updateById(@RequestBody DeviceRole deviceRole) {
+    public ApiResponse updateById(@RequestBody DeviceRole deviceRole,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+
+        deviceRole.setLoginUserInfo(this.getLoginUser(token));
         deviceRoleService.updateById(deviceRole);
         return ApiResponse.success(null);
     }
@@ -70,13 +73,16 @@
     @ApiOperation("鏍规嵁ID淇敼榛樿闂ㄧ缁勭姸鎬�")
     @PostMapping("/updateStatusById")
     @CloudRequiredPermission("business:devicerole:update")
-    public ApiResponse updateStatusById(@RequestBody DeviceRole deviceRole) {
+    public ApiResponse updateStatusById(@RequestBody DeviceRole deviceRole,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+
+        deviceRole.setLoginUserInfo(this.getLoginUser(token));
         deviceRoleService.updateStatusById(deviceRole);
         return ApiResponse.success(null);
     }
     @ApiOperation("榛樿涓嬪彂闂ㄧ缁勮鑹�")
     @PostMapping("/updateMemberRole")
-    public ApiResponse updateMemberRole(@RequestBody DeviceRole deviceRole) {
+    public ApiResponse updateMemberRole(@RequestBody DeviceRole deviceRole,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        deviceRole.setLoginUserInfo(this.getLoginUser(token));
         deviceRoleService.updateMemberRole(deviceRole);
         return ApiResponse.success(null);
     }
@@ -84,21 +90,21 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("business:devicerole:query")
-    public ApiResponse<PageData<DeviceRole>> findPage (@RequestBody PageWrap<DeviceRole> pageWrap) {
+    public ApiResponse<PageData<DeviceRole>> findPage (@RequestBody PageWrap<DeviceRole> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(deviceRoleService.findPage(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:devicerole:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response) {
+    public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         ExcelExporter.build(DeviceRole.class).export(deviceRoleService.findPage(pageWrap).getRecords(), "闂ㄧ瑙掕壊淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:devicerole:query")
-    public ApiResponse findById(@PathVariable Integer id) {
+    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(deviceRoleService.findById(id));
     }
 }

--
Gitblit v1.9.3