From 366334f7d319c1f5088f1ec9837dfd8a9bf34239 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 31 五月 2024 11:55:38 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java | 2 +-
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 29 +++++++++++++++++++++++++++++
server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 6 ++++++
server/system_gateway/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java | 3 ++-
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 6 ++++++
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java | 2 +-
6 files changed, 45 insertions(+), 3 deletions(-)
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 146954b..1c9b466 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
@@ -115,6 +115,12 @@
return ApiResponse.success(bookingsService.getMeetingDetail(id));
}
+ @ApiOperation("鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅")
+ @PostMapping("/getMeetingDetailByDate")
+ @CloudRequiredPermission("business:bookings:query")
+ public ApiResponse<MeetingDetailResponse> getMeetingDetailByDate(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(bookingsService.getMeetingDetailByDate(bookings));
+ }
@ApiOperation("鍙栨秷")
@PostMapping("/cancelById")
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
index e98eae7..2146546 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
@@ -87,7 +87,7 @@
@PostMapping("/myRoomsPage")
public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo user = getLoginUser(token);
- pageWrap.getModel().setUserId(user.getId());
+ pageWrap.getModel().setUserId(user.getMemberId());
IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java b/server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
index 472e826..1fac801 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/config/swagger/SwaggerConfig.java
@@ -65,7 +65,7 @@
.apiInfo(this.getApiInfo()).groupName("default")
.host(host)
.select()
- .apis( basePackage("com.doumee.api.cloud"))
+ .apis( basePackage("com.doumee.cloud;com.doumee.api.common"))
// 璁剧疆闇�瑕佽鎵弿鐨勭被锛岃繖閲岃缃负娣诲姞浜咢Api娉ㄨВ鐨勭被
// .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
.paths(PathSelectors.any())
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 fec87ee..035d41f 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
@@ -142,6 +142,12 @@
MeetingDetailResponse getMeetingDetail(Integer id);
/**
+ * 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅
+ * @param bean
+ * @return
+ */
+ MeetingDetailResponse getMeetingDetailByDate(Bookings bean);
+ /**
* 鑾峰彇浼氳浜岀淮鐮�
* @param id
* @param userId
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 5c5873f..5c36fc8 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
@@ -46,6 +46,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.awt.print.Book;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -794,6 +795,34 @@
return page;
}
+
+ @Override
+ public MeetingDetailResponse getMeetingDetailByDate(Bookings bean){
+ try {
+ if(Objects.isNull(bean)
+ || Objects.isNull(bean.getRoomId())
+ || Objects.isNull(bean.getStartTime())
+ || Objects.isNull(bean.getEndTime())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
+ .eq(Bookings::getRoomId,bean.getRoomId())
+ .ge(Bookings::getEndTime,DateUtil.getPlusTime(bean.getEndTime()))
+ .le(Bookings::getStartTime,DateUtil.getPlusTime(bean.getStartTime()))
+ );
+ if(Objects.isNull(bookings)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ return getMeetingDetail(bookings.getId());
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+
+
/**
* 浼氳璇︽儏
*
diff --git a/server/system_gateway/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java b/server/system_gateway/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
index e76f0a1..9198e09 100644
--- a/server/system_gateway/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
+++ b/server/system_gateway/src/main/java/com/doumee/config/jwt/JwtTokenUtil.java
@@ -76,7 +76,8 @@
public Boolean isTokenExpired(String token) {
try {
LoginUserInfo claims = getClaimsFromToken(token);
- Date expiration = claims.getLoginDate();
+ Date expiration = //claims.getLoginDate();
+ new Date(claims.getLoginDate().getTime() + jwtProperties.getExpiration());
return expiration.before(new Date());
} catch (Exception e) {
//楠岃瘉JWT绛惧悕澶辫触绛夊悓浜庝护鐗岃繃鏈�
--
Gitblit v1.9.3