From 46a174dd4b2d3208460411ed5d94a5726a5a2f72 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 06 一月 2025 18:15:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
index e41b7d2..accec22 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/RoomsCloudController.java
@@ -6,10 +6,10 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.business.model.RoomTime;
@@ -48,14 +48,15 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:rooms:create")
- public ApiResponse create(@RequestBody Rooms rooms) {
+ public ApiResponse create(@RequestBody Rooms rooms,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ rooms.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(roomsService.create(rooms));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:rooms:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
roomsService.deleteById(id);
return ApiResponse.success(null);
}
@@ -63,7 +64,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:rooms: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) {
@@ -76,7 +77,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:rooms:update")
- public ApiResponse updateById(@RequestBody Rooms rooms) {
+ public ApiResponse updateById(@RequestBody Rooms rooms,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ rooms.setLoginUserInfo(this.getLoginUser(token));
roomsService.updateById(rooms);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3