From 13b58d0fc355b6256d165cc2ae6a571ffa8e778d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 15 五月 2024 17:35:29 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 32 ++++++++++++++++++--------------
1 files changed, 18 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 2cb371f..a3d4dae 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
@@ -11,6 +11,7 @@
import com.doumee.core.utils.DESUtil;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.MeetConstants;
import com.doumee.dao.admin.request.QrOpenDoorDto;
import com.doumee.dao.business.RoomsMapper;
import com.doumee.dao.business.join.*;
@@ -72,7 +73,9 @@
@Transactional(rollbackFor = {BusinessException.class, Exception.class})
public Integer create(Rooms rooms) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(user ==null){
+ user = rooms.getLoginUserInfo();
+ }
isCreateParamValid(rooms, user);
Calendar starttime = Calendar.getInstance();
@@ -101,12 +104,11 @@
rooms.setStartTime(DateUtil.formatDate(starttime.getTime(), "yyyy-MM-dd HH:mm:ss"));
rooms.setEndTime(DateUtil.formatDate(endtime.getTime(), "yyyy-MM-dd HH:mm:ss"));
- //TODO 鏇存柊浼氳瀹ゆ椂闂存
+ // 鏇存柊浼氳瀹ゆ椂闂存
updateRoomTimes(rooms, user);
-
- //TODO 娣诲姞绠＄悊浜哄憳
+ // 娣诲姞绠＄悊浜哄憳
updateManager(rooms, user);
- //TODO 娣诲姞绠℃湇鍔￠」鐩�
+ // 娣诲姞绠℃湇鍔￠」鐩�
updateProjectRel(rooms, user);
return rooms.getId();
}
@@ -150,6 +152,7 @@
}
+ @Override
public Integer recordisExist(Integer roomsId) {
MPJLambdaWrapper<Bookings> queryBooke = new MPJLambdaWrapper<>();
queryBooke.eq(Bookings::getIsdeleted, Constants.ZERO);
@@ -322,7 +325,9 @@
public void updateById(Rooms rooms) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(user ==null){
+ user = rooms.getLoginUserInfo();
+ }
isCreateParamValid(rooms, user);
Calendar starttime = Calendar.getInstance();
@@ -384,8 +389,7 @@
}
}
@Override
- public void updateStatusById(Rooms rooms) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void updateStatusById(Rooms rooms,LoginUserInfo user) {
Integer re = recordisExist(rooms.getId());
@@ -446,10 +450,10 @@
// 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 user_rel u where u.ISDELETED=0 and u.OBJ_ID =t.id and u.USER_ID in (" + StringUtils.strip(collect.toString(),"[]")+" )");
+ 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(),"[]")+" )");
}
- String path = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECTS).getCode();
+ String path = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
IPage<Rooms> result = roomsJoinMapper.selectJoinPage(page, Rooms.class, queryWrapper);
result.getRecords().stream().forEach(s ->{
@@ -532,11 +536,11 @@
.eq("STATUS",Constants.ZERO)
.eq("ISDELETED",Constants.ZERO)
.like(StringUtils.isNotBlank(pageWrap.getModel().getRoomsName()),"NAME",pageWrap.getModel().getRoomsName())
- .exists(" select 1 from user_rel u where u.USER_ID = "+pageWrap.getModel().getUserId()+" and u.ISDELETED = 0 and u.OBJ_ID = rooms.id and u.OBJ_TYPE = 0 ")
+ .exists(" select 1 from meeting_user_rel u where u.USER_ID = "+pageWrap.getModel().getUserId()+" and u.ISDELETED = 0 and u.OBJ_ID = rooms.id and u.OBJ_TYPE = 0 ")
.orderByDesc("CREATE_DATE")
);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
page.getRecords().forEach(s->{
s.setPrefixUrl(prefixUrl);
@@ -572,7 +576,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼氳瀹や俊鎭�");
}
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
roomsResponse.setPrefixUrl(prefixUrl);
--
Gitblit v1.9.3