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") 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); } 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()) 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 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; } /** * 会议详情 * 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签名失败等同于令牌过期