From f5ab83dfad01c87828232af8cd18c676e69fd917 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 21 五月 2025 09:14:11 +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/BookingsServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 20 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 fa0abc5..fd048af 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
@@ -538,6 +539,7 @@
IPage<Bookings> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Bookings> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ Integer minute =getNearStartMinut();
queryWrapper.selectAll(Bookings.class);
queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
@@ -575,22 +577,25 @@
queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, Company::getId, pageWrap.getModel().getDepartmentId());
-
+ //status 鐘舵�� 0宸查绾� 1宸叉挙閿� 2宸茬粨鏉�
+ //浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�
queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
- " ( now() < t.START_TIME and t.status = 0 ) "
+ " ( now() < t.START_TIME and t.status = 0 AND SUBDATE( now(), INTERVAL -"+minute+" MINUTE ) < t.START_TIME ) "
)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.TWO),
- " ( now() >= t.START_TIME and t.END_TIME >= now() and t.status = 0 ) "
+ " ( t.status = 0 and t.START_TIME_REAL is not null ) "
)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.THREE),
- " ( ( now() > t.END_TIME and t.`STATUS` = 0 ) or t.`STATUS` = 2 ) "
+ " ( t.`STATUS` = 2 ) "
+ //" ( ( now() > t.END_TIME and t.`STATUS` = 0 ) or t.`STATUS` = 2 ) "
)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FOUR),
- " now() < t.START_TIME AND SUBDATE( t.START_TIME, INTERVAL 120 MINUTE ) < NOW() "
+ " (t.status = 0 AND SUBDATE( now(), INTERVAL -"+minute+" MINUTE ) > t.START_TIME and t.START_TIME_REAL is null ) "
+ //" now() < t.START_TIME AND SUBDATE( t.START_TIME, INTERVAL "+minute+" MINUTE ) < NOW() "
)
.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
&&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
@@ -611,7 +616,6 @@
SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
- Integer minute =getNearStartMinut();
result.getRecords().stream().forEach(s -> {
dealMeetingStatusByModel(s,minute);
MPJLambdaWrapper<Multifile> bookquery = new MPJLambdaWrapper<>();
@@ -640,16 +644,16 @@
s.setSysList(userrelList);
//浼氳瀹ょ鐞嗗憳
MPJLambdaWrapper<UserRel> param = new MPJLambdaWrapper<>();
- urquery.selectAll(UserRel.class);
- urquery.eq(UserRel::getObjType, MeetConstants.ZERO);
- urquery.eq(UserRel::getIsdeleted, MeetConstants.ZERO);
- urquery.eq(UserRel::getObjId, s.getRoomId());
- List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, urquery);
+ param.selectAll(UserRel.class);
+ param.eq(UserRel::getObjType, MeetConstants.ZERO);
+ param.eq(UserRel::getIsdeleted, MeetConstants.ZERO);
+ param.eq(UserRel::getObjId, s.getRoomId());
+ List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, param);
s.setAdminList(adminList);
//鏌ヨ鏄惁鏈夋潈闄�
s.setHasRole(getHasRoleByParam(s,userInfo,adminList));
- /* //鏈嶅姟椤�
+ /* //鏈嶅姟椤�
MPJLambdaWrapper<ProjectRel> prquery = new MPJLambdaWrapper<>();
prquery.selectAll(ProjectRel.class);
prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
@@ -670,7 +674,7 @@
if(Constants.equalsInteger(userInfo.getId(),s.getCreator()) ){
return 1;
}
- if(adminList!=null){
+ if(adminList!=null && userInfo!=null){
for(UserRel u : adminList){
if(Constants.equalsInteger(userInfo.getId(),u.getUserId()) ){
return 1;
@@ -1206,8 +1210,20 @@
if (Objects.isNull(bookings)) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌棰勭害璁板綍");
}
- if (!bookings.getCreator().equals(businessOverDTO.getUserId())) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰綘鐨勯绾﹁褰�,鏃犳硶杩涜鍙栨秷");
+
+// LoginUserInfo user =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ //浼氳瀹ょ鐞嗗憳
+ MPJLambdaWrapper<UserRel> param = new MPJLambdaWrapper<>();
+ param.selectAll(UserRel.class);
+ param.eq(UserRel::getObjType, MeetConstants.ZERO);
+ param.eq(UserRel::getIsdeleted, MeetConstants.ZERO);
+ param.eq(UserRel::getObjId, bookings.getRoomId());
+ List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, param);
+ Integer hasRole =getHasRoleByParam(bookings,businessOverDTO.getLoginUser(),adminList);
+
+// if (!bookings.getCreator().equals(businessOverDTO.getUserId())) {
+ if (!Constants.equalsInteger(hasRole,Constants.ONE)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝鍙湁浼氳瀹ょ鐞嗗憳鍜岀敵璇蜂汉鎵嶈兘杩涜璇ユ搷浣滃摝锛�");
}
if (Objects.nonNull(bookings.getStartTimeReal()) && System.currentTimeMillis() > bookings.getStartTimeReal().getTime()) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳宸插紑濮�,鏃犳硶杩涜鍙栨秷");
@@ -1304,6 +1320,37 @@
}
/**
+ * 鑷姩寮�濮嬩細璁�
+ */
+ @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).eq(Bookings::getRoomId,rooms.getId()).isNotNull(Bookings::getStartTimeReal).
+ apply(" DATE_FORMAT(NOW(), '%Y-%m-%d') = DATE_FORMAT(START_TIME, '%Y-%m-%d') ")
+ )<=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 ")
+ );
+ if(Objects.nonNull(bookings)){
+ bookings.setStartTimeReal(new Date());
+ bookings.setEditDate(bookings.getStartTimeReal());
+ bookingsMapper.updateById(bookings);
+ }
+ }
+ }
+ }
+
+ /**
* 鎻愬墠寮�濮�
* @param businessOverDTO
*/
@@ -1357,7 +1404,7 @@
.ne(Bookings::getId,bookings.getId())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�");
- };
+ }
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
.lambda()
@@ -1368,7 +1415,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(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�");
@@ -1386,6 +1433,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())
);
@@ -1433,7 +1481,10 @@
.eq(Bookings::getIsdeleted, MeetConstants.ZERO)
.eq(Bookings::getStatus, MeetConstants.ZERO)
.eq(Rooms::getId, rooms.getId())
- .apply("to_days(t.start_time) = to_days(now()) and t.end_time > now()")//瀛愭煡璇㈠綋澶╃殑
+ .apply(" ( " +
+ " to_days(t.start_time) = to_days(now()) " +
+ " and ( t.START_TIME_REAL is not null or ( t.end_time > now() and t.START_TIME_REAL is null ) ) " +
+ " ) ")//瀛愭煡璇㈠綋澶╃殑
.orderByAsc(Bookings::getStartTime);
Integer minute =getNearStartMinut();
List<Bookings> meetingList =bookingsMapper.selectJoinList(Bookings.class,queryWrapper);
@@ -1581,7 +1632,7 @@
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
.replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,""))
- .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"")));
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�")));
smsEmailList.add(smsEmail);
}
}
@@ -1607,7 +1658,7 @@
.replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(systemUser.getRealname(),""))
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
- .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),""))
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�"))
.replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
smsEmailList.add(smsEmail);
}
--
Gitblit v1.9.3