From 0627bb7ce8c035ee5a295f16fbba3e748511cff3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 19 九月 2024 17:47:43 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 17 +++++++++++++----
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java | 16 ++++++++--------
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 12 ++++++------
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java | 3 +++
server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 2 +-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 2 +-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java | 2 +-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 4 ++--
8 files changed, 35 insertions(+), 23 deletions(-)
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 c4552b2..b4fcbb8 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
@@ -106,12 +106,12 @@
ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response);
}
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:bookings:query")
- public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
- return ApiResponse.success(bookingsService.getMeetingDetail(id));
- }
+// @ApiOperation("鏍规嵁ID鏌ヨ")
+// @GetMapping("/{id}")
+// @RequiresPermissions("business:bookings:query")
+// public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
+// return ApiResponse.success(bookingsService.getMeetingDetail(id));
+// }
@ApiOperation("鍙栨秷")
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 ba5284e..2153eb1 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
@@ -75,14 +75,14 @@
- @ApiOperation("浼氳璇︽儏")
- @GetMapping("/meetingDetail")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
- })
- public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
- }
+// @ApiOperation("浼氳璇︽儏")
+// @GetMapping("/meetingDetail")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
+// })
+// public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
+// return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
+// }
@ApiOperation("鑾峰彇浼氳寮�闂ㄤ簩缁寸爜")
@GetMapping("/getQrCode")
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
index 1c9b466..b2e49ca 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
@@ -112,7 +112,7 @@
@GetMapping("/{id}")
@CloudRequiredPermission("business:bookings:query")
public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- return ApiResponse.success(bookingsService.getMeetingDetail(id));
+ return ApiResponse.success(bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
}
@ApiOperation("鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅")
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
index 2ccb1db..f4c09b9 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
@@ -89,7 +89,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
public ApiResponse<MeetingDetailResponse> meetingDetail( @RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
+ return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
}
@ApiOperation("鑾峰彇浼氳寮�闂ㄤ簩缁寸爜")
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
index 795cba5..3fd87ff 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java
@@ -93,8 +93,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
- public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
+ public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
index 401eae4..847ab2e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
@@ -47,6 +47,9 @@
@ApiModelProperty(value = "浼氳鏃堕棿 ( a ~ b)")
private String meetingTime;
+ @ApiModelProperty(value = "鏄惁鏄鐞嗗憳 0=鍚︼紱1=鏄�")
+ private Integer isAdmin = 0 ;
+
@ApiModelProperty(value = "鍙備細浜哄憳")
private List<UserResponse> userResponseList;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
index 6a56fb5..4f92c34 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
@@ -143,7 +143,7 @@
* @param id
* @return
*/
- MeetingDetailResponse getMeetingDetail(Integer id);
+ MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId);
/**
* 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 44ca327..dd0a9bb 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -863,7 +863,7 @@
if(Objects.isNull(bookings)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- return getMeetingDetail(bookings.getId());
+ return getMeetingDetail(bookings.getId(),null);
}catch (Exception e){
e.printStackTrace();
}
@@ -880,7 +880,7 @@
* @return
*/
@Override
- public MeetingDetailResponse getMeetingDetail(Integer id) {
+ public MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId) {
MeetingDetailResponse meetingDetailResponse = bookingsMapper.meetingDetail(id);
if (Objects.isNull(meetingDetailResponse)) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌浼氳璇︽儏");
@@ -925,9 +925,18 @@
.eq("OBJ_ID", meetingDetailResponse.getRoomId())
.eq("OBJ_TYPE",MeetConstants.ZERO)
);
+ if(Constants.equalsInteger(sysUserId,meetingDetailResponse.getBookingUserId())){
+ meetingDetailResponse.setIsAdmin(Constants.ONE);
+ }
if (!Objects.isNull(userRelList) && userRelList.size() > 0) {
meetingDetailResponse.setRoomUser(systemUserService.findById(userRelList.get(MeetConstants.ZERO).getUserId()));
+ if( Objects.nonNull(sysUserId) &&
+ userRelList.stream().filter(i->Constants.equalsInteger(i.getUserId(),sysUserId)).collect(Collectors.toList()).size()>Constants.ZERO
+ ){
+ meetingDetailResponse.setIsAdmin(Constants.ONE);
+ }
}
+
return meetingDetailResponse;
}
@@ -1022,7 +1031,7 @@
Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
.eq(UserRel::getIsdeleted,Constants.ZERO)
.eq(UserRel::getObjId,bookings.getRoomId())
- .eq(UserRel::getObjType,Constants.ONE)
+ .eq(UserRel::getObjType,Constants.ZERO)
.eq(UserRel::getUserId,businessOverDTO.getUserId()));
if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
@@ -1093,7 +1102,7 @@
Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
.eq(UserRel::getIsdeleted,Constants.ZERO)
.eq(UserRel::getObjId,bookings.getRoomId())
- .eq(UserRel::getObjType,Constants.ONE)
+ .eq(UserRel::getObjType,Constants.ZERO)
.eq(UserRel::getUserId,businessOverDTO.getUserId()));
if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
--
Gitblit v1.9.3