From e87b711cc267567d8374315dc99ef9780cb25dd8 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 26 三月 2025 17:55:57 +0800 Subject: [PATCH] 代码初始化 --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 38 insertions(+), 5 deletions(-) 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 f353d3f..a7898d8 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 @@ -374,6 +374,7 @@ userAction.setRemark(info); userAction.setMemberId(id+""); userActionMapper.insert(userAction); + } @Override @@ -649,7 +650,7 @@ //鏌ヨ鏄惁鏈夋潈闄� s.setHasRole(getHasRoleByParam(s,userInfo,adminList)); - /* //鏈嶅姟椤� + /* //鏈嶅姟椤� MPJLambdaWrapper<ProjectRel> prquery = new MPJLambdaWrapper<>(); prquery.selectAll(ProjectRel.class); prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO); @@ -1091,7 +1092,8 @@ @Override public MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId) { MeetingDetailResponse meetingDetailResponse = bookingsMapper.meetingDetail(id); - if (Objects.isNull(meetingDetailResponse)) { + if (Objects.isNull(meetingDetailResponse) + || Constants.equalsInteger(meetingDetailResponse.getIsdeleted(),Constants.ONE) ) { throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌浼氳璇︽儏"); } //棰勭害浜� @@ -1184,6 +1186,7 @@ public Integer reservationMeeting(BookingsRequest bookingsRequest) { Bookings bookings = new Bookings(); BeanUtils.copyProperties(bookingsRequest, bookings); + bookings.setJoinNotice(bookingsRequest.getJoinNotice()); if (Objects.isNull(bookingsRequest.getId())) { this.create(bookings); return bookings.getId(); @@ -1302,6 +1305,34 @@ } /** + * 鑷姩寮�濮嬩細璁� + */ + @Override + public void autoStart(){ + List<Rooms> roomList = roomsMapper.selectList(new QueryWrapper<Rooms>().lambda().eq(Rooms::getIsdeleted,Constants.ZERO).eq(Rooms::getStatus,Constants.ZERO)); + for (Rooms rooms:roomList) { + //鏌ヨ褰撳墠浼氳瀹ゆ槸鍚﹀瓨鍦ㄨ繘琛屼腑鐨勪細璁� + if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda().eq(Bookings::getIsdeleted,Constants.ZERO) + .eq(Bookings::getStatus,Constants.ZERO).isNotNull(Bookings::getStartTimeReal) + )<=Constants.ZERO){ + //鏍规嵁浼氳瀹よ幏鍙栧彲浠ュ紑鍚殑浼氳璁板綍锛堢涓�鏉¤褰曪級 + Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda() + .eq(Bookings::getIsdeleted,Constants.ZERO) + .eq(Bookings::getStatus,Constants.ZERO) + .eq(Bookings::getRoomId,rooms.getId()) + .apply(" now() > START_TIME and now < END_TIME ") + .isNull(Bookings::getStartTimeReal) + .orderByAsc(Bookings::getStartTime) + .last(" limit 1 ") + ); + bookings.setStartTimeReal(new Date()); + bookings.setEditDate(new Date()); + bookingsMapper.updateById(bookings); + } + } + } + + /** * 鎻愬墠寮�濮� * @param businessOverDTO */ @@ -1355,7 +1386,7 @@ .ne(Bookings::getId,bookings.getId()) )>Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�"); - }; + } if(bookingsMapper.selectCount(new QueryWrapper<Bookings>() .lambda() @@ -1366,7 +1397,7 @@ .eq(Bookings::getRoomId,bookings.getRoomId()) )>Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠寮�鍚椂闂翠笌鍏朵粬浼氳瀛樺湪鍐茬獊锛屾棤娉曞紑濮嬩細璁�"); - }; + } }else{ if(bookings.getStartTime().getTime() > System.currentTimeMillis()){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�"); @@ -1384,6 +1415,7 @@ .set(Bookings::getDoneInfo,"鍏朵粬浼氳寮�濮嬶紝鑷姩鍏抽棴") .apply(" ( END_TIME < now() or ( END_TIME > now() and START_TIME < now() and START_TIME_REAL is null ) )") .eq(Bookings::getStatus,Constants.ZERO) + .ne(Bookings::getId,bookings.getId()) .eq(Bookings::getRoomId,bookings.getRoomId()) ); @@ -1579,7 +1611,7 @@ .replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),"")) .replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),"")) .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")) - .replace("{浼氳澶囨敞}",StringUtils.defaultString(smsEmail.getRemark(),""))); + .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�"))); smsEmailList.add(smsEmail); } } @@ -1605,6 +1637,7 @@ .replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(systemUser.getRealname(),"")) .replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),"")) .replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),"")) + .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�")) .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,""))); smsEmailList.add(smsEmail); } -- Gitblit v1.9.3