From 2a0e9e6f92c5f25a53aefa4edb708f42472e8a6e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 16:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java | 1
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java | 1
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.java | 26 +++++---
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java | 19 +++--
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java | 7 +-
server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java | 1
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.java | 5 +
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 3
server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java | 3
/dev/null | 40 -------------
server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java | 1
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java | 13 ++--
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java | 5 -
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java | 10 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 10 +--
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java | 9 +-
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.java | 1
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java | 4
18 files changed, 58 insertions(+), 101 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/BaseController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/BaseController.java
deleted file mode 100644
index a390450..0000000
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/BaseController.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.doumee.api;
-
-import com.doumee.core.model.LoginUserInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Controller鍩虹被
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
-@Slf4j
-public class BaseController {
-
- /**
- * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
- */
- protected LoginUserInfo getLoginUser () {
- return (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- }
-
-
- /**
- * 寰楀埌request瀵硅薄
- *
- * @return
- */
- public HttpServletRequest getRequest() {
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- return request;
- }
-
-
-}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java
index 896c0c4..cf6831e 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/CloudBookingsController.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java
index 30fff99..ef28f0c 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingTimeController.java
@@ -7,7 +7,6 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.BookingTime;
-import com.doumee.dao.business.model.RoomTime;
import com.doumee.service.business.BookingTimeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
index 0b54298..b1243f2 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
@@ -57,7 +57,7 @@
@PostMapping("/create")
@RequiresPermissions("business:bookings:create")
public ApiResponse create(@RequestBody Bookings bookings) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
bookings.setCreator(user.getId());
return ApiResponse.success(bookingsService.create(bookings));
}
@@ -87,7 +87,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
bookings.setCreator(user.getId());
bookingsService.updateById(bookings);
return ApiResponse.success(null);
@@ -197,7 +197,7 @@
startTime = DateUtil.getMonday();
endTime = DateUtil.getSunday();
}
- return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser().getId(), null,startTime,endTime));
+ return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser(null).getId(), null,startTime,endTime));
}
/**
@@ -207,8 +207,6 @@
@ApiOperation("鑾峰彇鐢ㄦ埛褰撳綋鏈堥绾︿細璁儏鍐�")
@PostMapping("/findMothBookingMeet")
public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId,String dateMonth){
-
-
- return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser().getId(),roomId,dateMonth));
+ return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser(null).getId(),roomId,dateMonth));
}
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
index 19be730..ba0e027 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/DevicesController.java
@@ -12,7 +12,6 @@
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -36,8 +35,8 @@
@PostMapping("/create")
@RequiresPermissions("business:devices:create")
public ApiResponse create(@RequestBody Devices devices) {
- devices.setCreator(getLoginUser().getId());
- devices.setEditor(getLoginUser().getId());
+ devices.setCreator(getLoginUser(null).getId());
+ devices.setEditor(getLoginUser(null).getId());
return ApiResponse.success(devicesService.create(devices));
}
@@ -66,7 +65,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:devices:update")
public ApiResponse updateById(@RequestBody Devices devices) {
- devices.setEditor(getLoginUser().getId());
+ devices.setEditor(getLoginUser(null).getId());
devicesService.updateById(devices);
return ApiResponse.success(null);
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
index 1f118e3..d7ce866 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
-import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
@@ -50,7 +49,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "yearMonth", value = "骞存湀 yyyy-MM", required = true)
})
public ApiResponse<List<MonthDataResponse>> monthDay(@RequestParam String yearMonth) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
List<String> dataList = DateUtil.getDayByMonth(yearMonth);
List<MonthDataResponse> monthDataResponseList = new ArrayList<>();
List<Bookings> bookings = bookingsService.getMyBookings(user.getId(),yearMonth);
@@ -71,7 +70,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public ApiResponse<IPage<MeetingListResponse>> myMeetingPage(@RequestBody PageWrap<MeetingPageRequest> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
pageWrap.getModel().setUserId(user.getId());
IPage<MeetingListResponse> page = bookingsService.getMyMeetingPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
@@ -96,7 +95,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
public ApiResponse<String> getQrCode(@RequestParam Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getQrCode(id,user.getId()));
}
@@ -108,7 +107,7 @@
@ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws Exception {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
response.setHeader("Cache-Control", "no-store, no-cache");
response.setContentType("image/jpeg");
String content =bookingsService.getQrCode(id,user.getId());
@@ -122,7 +121,7 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
bookingsRequest.setCreator(user.getId());
bookingsRequest.setEditor(user.getId());
return ApiResponse.success("鎿嶄綔鎴愬姛",bookingsService.reservationMeeting(bookingsRequest));
@@ -135,7 +134,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
public ApiResponse reservationCancel(@RequestParam Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
bookingsService.reservationCancel(id,user.getId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java
index 9f2bd43..3a76710 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/ProjectsController.java
@@ -36,8 +36,8 @@
@PostMapping("/create")
@RequiresPermissions("business:projects:create")
public ApiResponse create(@RequestBody Projects projects) {
- projects.setCreator(getLoginUser().getId());
- projects.setEditor(getLoginUser().getId());
+ projects.setCreator(getLoginUser(null).getId());
+ projects.setEditor(getLoginUser(null).getId());
return ApiResponse.success(projectsService.create(projects));
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java
index e6b79f6..ae8a7f4 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomTimeController.java
@@ -6,11 +6,6 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
-import com.doumee.dao.business.BookingTimeMapper;
-import com.doumee.dao.business.join.BookingTimeJoinMapper;
-import com.doumee.dao.business.join.BookingsJoinMapper;
-import com.doumee.dao.business.join.RoomTimeJoinMapper;
-import com.doumee.dao.business.model.BookingTime;
import com.doumee.dao.business.model.RoomTime;
import com.doumee.service.business.RoomTimeService;
import io.swagger.annotations.Api;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
index 0160517..f9f6949 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
-import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -88,7 +87,7 @@
@PostMapping("/updateStatusById")
@RequiresPermissions("business:rooms:update")
public ApiResponse updateStatusById(@RequestBody Rooms rooms) {
- roomsService.updateStatusById(rooms);
+ roomsService.updateStatusById(rooms,this.getLoginUser(null));
return ApiResponse.success(null);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@@ -144,7 +143,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
})
public ApiResponse<String> getQrCode(@RequestParam Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,user.getId()));
}
@@ -155,7 +154,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true)
})
public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws Exception {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
response.setHeader("Cache-Control", "no-store, no-cache");
response.setContentType("image/jpeg");
String content =roomsService.getQrCode(id,user.getId());
@@ -177,7 +176,7 @@
@ApiOperation("鎴戠殑浼氳瀹ゅ垪琛�")
@PostMapping("/myRoomsPage")
public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
pageWrap.getModel().setUserId(user.getId());
IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.java
index 216de86..b77bfd6 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudBookingTimeController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.BookingTime;
import com.doumee.service.business.BookingTimeService;
import io.swagger.annotations.Api;
@@ -34,14 +35,14 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:bookingtime:create")
- public ApiResponse create(@RequestBody BookingTime bookingTime) {
+ public ApiResponse create(@RequestBody BookingTime bookingTime,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(bookingTimeService.create(bookingTime));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:bookingtime:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
bookingTimeService.deleteById(id);
return ApiResponse.success(null);
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.java
index 8fa1a15..1d92a06 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMeetingController.java
@@ -5,6 +5,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.QrCodeUtils;
import com.doumee.dao.business.model.Bookings;
@@ -69,8 +70,9 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse<IPage<MeetingListResponse>> myMeetingPage(@RequestBody PageWrap<MeetingPageRequest> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public ApiResponse<IPage<MeetingListResponse>> myMeetingPage(@RequestBody PageWrap<MeetingPageRequest> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
+ //(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
pageWrap.getModel().setUserId(user.getId());
IPage<MeetingListResponse> page = bookingsService.getMyMeetingPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
@@ -94,8 +96,9 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
- public ApiResponse<String> getQrCode(@RequestParam Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public ApiResponse<String> getQrCode(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getQrCode(id,user.getId()));
}
@@ -106,8 +109,9 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws Exception {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void getQrCodeImg(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token, HttpServletResponse response) throws Exception {
+ LoginUserInfo user = getLoginUser(token);
+// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
response.setHeader("Cache-Control", "no-store, no-cache");
response.setContentType("image/jpeg");
String content =bookingsService.getQrCode(id,user.getId());
@@ -120,8 +124,9 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = getLoginUser(token);
+// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
bookingsRequest.setCreator(user.getId());
bookingsRequest.setEditor(user.getId());
return ApiResponse.success("鎿嶄綔鎴愬姛",bookingsService.reservationMeeting(bookingsRequest));
@@ -133,8 +138,9 @@
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
- public ApiResponse reservationCancel(@RequestParam Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public ApiResponse reservationCancel(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(token);
bookingsService.reservationCancel(id,user.getId());
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.java
index a2c1aae..fc44628 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudMultifileController.java
@@ -1,6 +1,5 @@
package com.doumee.api.cloud;
-import com.doumee.api.BaseController;
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java
index 2c1fa9d..2690bc9 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Projects;
import com.doumee.dao.web.response.ProjectsResponse;
import com.doumee.service.business.ProjectsService;
@@ -35,9 +36,9 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:projects:create")
- public ApiResponse create(@RequestBody Projects projects) {
- projects.setCreator(getLoginUser().getId());
- projects.setEditor(getLoginUser().getId());
+ public ApiResponse create(@RequestBody Projects projects,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ projects.setCreator(getLoginUser(token).getId());
+ projects.setEditor(getLoginUser(token).getId());
return ApiResponse.success(projectsService.create(projects));
}
@@ -65,7 +66,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:projects:update")
- public ApiResponse updateById(@RequestBody Projects projects) {
+ public ApiResponse updateById(@RequestBody Projects projects,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ projects.setEditor(getLoginUser(token).getId());
projectsService.updateById(projects);
return ApiResponse.success(null);
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java
index 99dc39d..1f24551 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java
@@ -86,8 +86,10 @@
@ApiOperation("淇敼鐘舵��")
@PostMapping("/updateStatusById")
@CloudRequiredPermission("business:rooms:update")
- public ApiResponse updateStatusById(@RequestBody Rooms rooms) {
- roomsService.updateStatusById(rooms);
+ public ApiResponse updateStatusById(@RequestBody Rooms rooms
+ ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
+ roomsService.updateStatusById(rooms,user);
return ApiResponse.success(null);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@@ -142,8 +144,9 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
})
- public ApiResponse<String> getQrCode(@RequestParam Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public ApiResponse<String> getQrCode(@RequestParam Integer id
+ ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,user.getId()));
}
@@ -153,8 +156,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true)
})
- public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws Exception {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void getQrCodeImg(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token, HttpServletResponse response) throws Exception {
+ LoginUserInfo user = this.getLoginUser(token);
response.setHeader("Cache-Control", "no-store, no-cache");
response.setContentType("image/jpeg");
String content =roomsService.getQrCode(id,user.getId());
@@ -175,8 +178,8 @@
@ApiOperation("鎴戠殑浼氳瀹ゅ垪琛�")
@PostMapping("/myRoomsPage")
- public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
pageWrap.getModel().setUserId(user.getId());
IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
index 209d40f..65f9f3e 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/CaptchaController.java
@@ -1,6 +1,5 @@
package com.doumee.api.common;
-import com.doumee.api.BaseController;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.service.common.CaptchaService;
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java
index a446dbd..24df14b 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/PublicController.java
@@ -1,7 +1,6 @@
package com.doumee.api.common;
import com.alibaba.fastjson.JSONObject;
-import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.utils.Constants;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java
index 25f4158..23a1f1d 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/RoomsService.java
@@ -1,6 +1,7 @@
package com.doumee.service.business;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Rooms;
@@ -52,7 +53,7 @@
*/
void updateById(Rooms rooms);
- void updateStatusById(Rooms rooms);
+ void updateStatusById(Rooms rooms, LoginUserInfo user);
/**
* 鎵归噺涓婚敭鏇存柊
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
index b047c08..5ae8143 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
@@ -386,8 +386,7 @@
}
}
@Override
- public void updateStatusById(Rooms rooms) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void updateStatusById(Rooms rooms,LoginUserInfo user) {
Integer re = recordisExist(rooms.getId());
--
Gitblit v1.9.3