From 182764bc1b318bca9e36299387e2b740bfae242f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 08 五月 2025 10:34:53 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
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 5477185..0962f78 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
@@ -4,9 +4,9 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
@@ -18,10 +18,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
-import com.doumee.dao.web.request.MeetingPageRequest;
import com.doumee.dao.web.request.RoomsRequest;
-import com.doumee.dao.web.response.MeetingListResponse;
-import com.doumee.dao.web.response.ProjectsResponse;
import com.doumee.dao.web.response.RoomsResponse;
import com.doumee.service.business.RoomsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -37,8 +34,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -106,9 +101,12 @@
roomsMapper.insert(rooms);
if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
List<Multifile> multifileList = rooms.getMultifileList();
+ if(CollectionUtils.isEmpty(multifileList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇蜂笂浼犻檮浠朵俊鎭�");
+ }
for (Multifile multifile:multifileList) {
if(Objects.isNull(multifile)
- || StringUtils.isBlank(multifile.getFileurl())){
+ || StringUtils.isBlank(multifile.getFileurl())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍙傛暟閿欒");
}
multifile.setCreateDate(new Date());
@@ -367,7 +365,7 @@
Integer re = recordisExist(rooms.getId());
if (Constants.equalsInteger(re, Constants.ONE)) {
//瀛樹笅棰勭害璁板綍涓嶅厑璁告洿鏂板紑鏀炬椂闂村拰绮掑害鍒嗛挓
- // throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳瀹ゅ瓨鍦ㄩ绾︿腑鐨勮褰曪紝涓嶅厑璁镐慨鏀�");
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳瀹ゅ瓨鍦ㄩ绾︿腑鐨勮褰曪紝涓嶅厑璁镐慨鏀�");
rooms.setStartTime(null);
rooms.setEndTime(null);
rooms.setIntervalTime(null);
@@ -385,8 +383,11 @@
roomsMapper.update(rooms, Wrappers.<Rooms>lambdaUpdate()
.set(Rooms::getFileType, rooms.getFileType())
+// .set(Rooms::getEndTime, rooms.getEndTime())
+// .set(Rooms::getStartTime, rooms.getStartTime())
.set(Rooms::getLimitNum, rooms.getLimitNum())
.set(Rooms::getTips, rooms.getTips())
+ .set(Rooms::getIntervalTime, rooms.getIntervalTime())
.set(Rooms::getImgurl, rooms.getImgurl())
.eq(Rooms::getId, rooms.getId()));
@@ -397,6 +398,9 @@
if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
List<Multifile> multifileList = rooms.getMultifileList();
+ if(CollectionUtils.isEmpty(multifileList)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇蜂笂浼犻檮浠朵俊鎭�");
+ }
for (Multifile multifile:multifileList) {
if(Objects.isNull(multifile)
|| StringUtils.isBlank(multifile.getFileurl())){
@@ -417,7 +421,7 @@
rooms.setEndTime(DateUtil.formatDate(endtime.getTime(), "yyyy-MM-dd HH:mm:ss"));
- //TODO 鏇存柊浼氳瀹ゆ椂闂存
+ //TODO鏇� 鏂颁細璁鏃堕棿娈�
if (!Constants.equalsInteger(re, Constants.ONE)) {
updateRoomTimes(rooms, user);
}
@@ -488,9 +492,8 @@
IPage<Rooms> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Rooms> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
-
queryWrapper.selectAll(Rooms.class);
-
+ queryWrapper.select("(select count(a.id) from meeting_book a where a.room_id=t.id and a.isdeleted=0 and a.status=0)",Rooms::getBookingNum);
queryWrapper.orderByDesc(Rooms::getCreateDate);
queryWrapper.eq(Rooms::getIsdeleted, Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Rooms::getName, pageWrap.getModel().getName());
@@ -498,7 +501,6 @@
if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(pageWrap.getModel().getSysList())){
// queryWrapper.leftJoin(UserRel.class,UserRel::getObjId,Rooms::getId);
List<Integer> collect = pageWrap.getModel().getSysList().stream().map(UserRel::getUserId).collect(Collectors.toList());
-
queryWrapper.exists("select u.id from meeting_user_rel u where u.ISDELETED=0 and u.OBJ_ID =t.id and u.USER_ID in (" + StringUtils.strip(collect.toString(),"[]")+" )");
}
--
Gitblit v1.9.3