From 074485f56f073cf11fb29e6aab4ec9a2d4f3f549 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 九月 2024 14:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 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 a3d4dae..5477185 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
@@ -16,6 +16,7 @@
import com.doumee.dao.business.RoomsMapper;
import com.doumee.dao.business.join.*;
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;
@@ -56,6 +57,9 @@
private RoomsMapper roomsMapper;
@Autowired
private RoomsJoinMapper roomsJoinMapper;
+ @Autowired
+ private MultifileJoinMapper multifileJoinMapper;
+
@Autowired
private RoomTimeJoinMapper roomTimeJoinMapper;
@@ -90,7 +94,9 @@
if (starttime.after(endtime) || starttime.equals(endtime)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏃ユ湡鍖洪棿閿欒");
}
-
+ if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)&&CollectionUtils.isEmpty(rooms.getMultifileList())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈笂浼犳枃浠跺浘鐗�");
+ }
rooms.setCreateDate(new Date());
rooms.setIsdeleted(Constants.ZERO);
@@ -98,7 +104,21 @@
rooms.setStatus(Constants.ZERO);
rooms.setEditDate(rooms.getCreateDate());
roomsMapper.insert(rooms);
-
+ if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
+ List<Multifile> multifileList = rooms.getMultifileList();
+ for (Multifile multifile:multifileList) {
+ if(Objects.isNull(multifile)
+ || StringUtils.isBlank(multifile.getFileurl())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍙傛暟閿欒");
+ }
+ multifile.setCreateDate(new Date());
+ multifile.setObjId(rooms.getId());
+ multifile.setObjType(Constants.FOUR);
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setCreator(user.getId());
+ }
+ multifileJoinMapper.insert(multifileList);
+ }
rooms.setStartTime(rooms.getStartTime()+":00");
rooms.setEndTime(rooms.getEndTime()+":00");
rooms.setStartTime(DateUtil.formatDate(starttime.getTime(), "yyyy-MM-dd HH:mm:ss"));
@@ -117,6 +137,7 @@
if (StringUtils.isBlank(rooms.getName()) ||
StringUtils.isBlank(rooms.getStartTime()) ||
StringUtils.isBlank(rooms.getEndTime()) ||
+ Objects.isNull(rooms.getFileType()) ||
rooms.getIntervalTime() == null
) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
@@ -352,15 +373,43 @@
rooms.setIntervalTime(null);
}
-
rooms.setEditDate(new Date());
rooms.setEditor(user.getId());
+
+// if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)&&StringUtils.isBlank(rooms.getImgurl())){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈笂浼犳枃浠跺浘鐗�");
+// }
+// if(Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
+// rooms.setImgurl(null);
+// }
+
roomsMapper.update(rooms, Wrappers.<Rooms>lambdaUpdate()
+ .set(Rooms::getFileType, rooms.getFileType())
.set(Rooms::getLimitNum, rooms.getLimitNum())
.set(Rooms::getTips, rooms.getTips())
.set(Rooms::getImgurl, rooms.getImgurl())
.eq(Rooms::getId, rooms.getId()));
+ multifileJoinMapper.delete(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,rooms.getId())
+ .eq(Multifile::getObjType,Constants.FOUR)
+ );
+
+ if(!Constants.equalsInteger(rooms.getFileType(),Constants.TWO)){
+ List<Multifile> multifileList = rooms.getMultifileList();
+ for (Multifile multifile:multifileList) {
+ if(Objects.isNull(multifile)
+ || StringUtils.isBlank(multifile.getFileurl())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"闄勪欢鍙傛暟閿欒");
+ }
+ multifile.setCreateDate(new Date());
+ multifile.setObjId(rooms.getId());
+ multifile.setObjType(Constants.FOUR);
+ multifile.setIsdeleted(Constants.ZERO);
+ multifile.setCreator(user.getId());
+ }
+ multifileJoinMapper.insert(multifileList);
+ }
rooms.setStartTime(rooms.getStartTime()+":00");
rooms.setEndTime(rooms.getEndTime()+":00");
@@ -483,6 +532,19 @@
findpr.leftJoin(Projects.class,Projects::getId,ProjectRel::getProjectId);
List<ProjectRel> projectLisr= projectRelJoinMapper.selectJoinList(ProjectRel.class,findpr);
s.setProjectList(projectLisr);
+
+ if(!Constants.equalsInteger(s.getFileType(),Constants.TWO)){
+ List<Multifile > multifileList = multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,s.getId())
+ .eq(Multifile::getObjType,Constants.FOUR)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ s.setMultifileList(multifileList);
+ }
+ }
});
return PageData.from(result);
@@ -591,6 +653,13 @@
List<ProjectRel> projectList= projectRelJoinMapper.selectJoinList(ProjectRel.class,findProjectRel);
roomsResponse.setProjectList(projectList);
+ if(Objects.nonNull(roomsResponse.getFileType()) && !Constants.equalsInteger(roomsResponse.getFileType(),Constants.TWO)){
+ roomsResponse.setMultifileList(
+ multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,roomsResponse.getId())
+ .eq(Multifile::getObjType,Constants.FOUR))
+ );
+ }
+
return roomsResponse;
}
--
Gitblit v1.9.3