From 4cdff25609300b4613aa2539c8b04976df65bc33 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 六月 2024 18:28:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 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 eb33fb0..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
@@ -73,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();
@@ -102,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();
}
@@ -151,6 +152,7 @@
}
+ @Override
public Integer recordisExist(Integer roomsId) {
MPJLambdaWrapper<Bookings> queryBooke = new MPJLambdaWrapper<>();
queryBooke.eq(Bookings::getIsdeleted, Constants.ZERO);
@@ -323,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();
@@ -385,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());
@@ -447,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(MeetConstants.OSS, MeetConstants.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 ->{
@@ -533,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(MeetConstants.OSS, MeetConstants.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);
@@ -573,7 +576,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼氳瀹や俊鎭�");
}
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.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