From 034f720f0bbc7f253c15613c28d994d7abf401eb Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 24 九月 2026 10:53:33 +0800
Subject: [PATCH] feat: 现场需求后端改动
---
src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java | 208 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 204 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
index ce70e50..bc23509 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
+import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.collaborativeApproval.dto.MeetSummaryDto;
import com.ruoyi.collaborativeApproval.dto.MeetUseDto;
import com.ruoyi.collaborativeApproval.dto.MeetingItem;
@@ -22,10 +25,21 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingDraftVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.domain.SysPost;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysPostMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.staff.mapper.StaffOnJobMapper;
+import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -33,14 +47,19 @@
@Service
@RequiredArgsConstructor
-public class MeetingServiceImpl implements MeetingService {
+public class MeetingServiceImpl extends ServiceImpl<MeetingRoomMapper, MeetingRoom> implements MeetingService {
private final MeetingRoomMapper meetingRoomMapper;
private final MeetDraftMapper meetDraftMapper;
private final MeetApplicationMapper meetApplicationMapper;
+ private final StaffOnJobMapper staffOnJobMapper;
private final MeetingMinutesMapper meetingMinutesMapper;
+ private final SysUserMapper userMapper;
+ private final SysPostMapper sysPostMapper;
+ private final ISysNoticeService sysNoticeService;
+
@Override
public IPage<MeetingRoom> getMeetingRoomList(SearchMeetingRoomVo vo) {
@@ -70,7 +89,22 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void deleteMeetingRoom(Long id) {
+ if (id == null){
+ throw new ServiceException("鍒犻櫎浼氳瀹ゅけ璐�,浼氳瀹D涓嶈兘涓虹┖");
+ }
+
+ LocalDateTime now = LocalDateTime.now();
+ List<MeetApplication> meetApplicationList = meetApplicationMapper.selectList(Wrappers.<MeetApplication>lambdaQuery()
+ .eq(MeetApplication::getRoomId, id)
+ .gt(MeetApplication::getEndTime, now)
+ .in(MeetApplication::getStatus, Arrays.asList(0, 1)));
+
+ if (!meetApplicationList.isEmpty()){
+ throw new ServiceException("鍒犻櫎浼氳瀹ゅけ璐�,璇ヤ細璁灏氭湁鏈紑濮嬫垨杩涜涓殑鏈夋晥浼氳棰勭害");
+ }
+
meetingRoomMapper.deleteById(id);
}
@@ -114,13 +148,71 @@
}
@Override
- public void saveMeetApplication(MeetApplication meetApplication) {
+ public R<Void> saveMeetApplication(MeetApplication meetApplication) {
meetApplication.setApplicant(SecurityUtils.getUsername());
+
+ // 鏃堕棿鍐茬獊鏍￠獙
+ LambdaQueryWrapper<MeetApplication> meetApplicationLambdaQueryWrapper = Wrappers.<MeetApplication>lambdaQuery()
+ .eq(MeetApplication::getRoomId, meetApplication.getRoomId())
+ // 濡傛灉id涓嶄负null鍒欐帓闄よ嚜宸�
+ .ne(meetApplication.getId() != null, MeetApplication::getId, meetApplication.getId())
+ // 鏃堕棿鍐茬獊鍒ゆ柇
+ .lt(MeetApplication::getStartTime, meetApplication.getEndTime())
+ .gt(MeetApplication::getEndTime, meetApplication.getStartTime());
+
+ Long count = meetApplicationMapper.selectCount(meetApplicationLambdaQueryWrapper);
+ if (count > 0) {
+ return R.fail("鎵�閫変細璁鍦ㄨ鏃堕棿娈靛凡鏈夊叾浠栦細璁紝璇疯皟鏁存椂闂存垨鏇存崲浼氳瀹�");
+ }
+
if (meetApplication.getId() != null) {
+ // 鏇存柊
meetApplicationMapper.updateById(meetApplication);
} else {
+ // 鏂板
meetApplicationMapper.insert(meetApplication);
}
+
+ /*浼氳鍙戝竷鐨勬秷鎭�氱煡*/
+ //鍙備細浜哄憳id(浜哄憳鍙拌处鍜岀敤鎴疯〃閫氳繃浜哄憳缂栧彿鍜岀敤鎴峰悕绉�(鐧诲綍璐﹀彿)鍋氬尮閰�)
+ if (Integer.valueOf(1).equals(meetApplication.getPublishStatus())) {
+ MeetApplication application = meetApplicationMapper.selectById(meetApplication.getId());
+
+ String cleanStr = application.getParticipants()
+ .replaceAll("^\\[|\\]$", "")
+ .trim();
+
+ List<Long> userIds = Arrays.stream(cleanStr.split(","))
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .map(Long::valueOf)
+ .map(staffId -> {
+ StaffOnJob record = staffOnJobMapper.selectById(staffId);
+ if (record == null) {
+ return null;
+ }
+ return userMapper.selectOne(
+ Wrappers.<SysUser>lambdaQuery()
+ .eq(SysUser::getUserName, record.getStaffNo())
+ );
+ })
+ .filter(Objects::nonNull)
+ .map(SysUser::getUserId)
+ .collect(Collectors.toList());
+
+ if (!userIds.isEmpty()) {
+ sysNoticeService.simpleNoticeByUser(
+ "浼氳閫氱煡",
+ "浼氳涓婚锛�" + application.getTitle() + "\t" +
+ "浼氳鏃堕棿锛�" + application.getStartTime() + "-" + application.getEndTime() + "\t" +
+ "鍙戣捣浜猴細" + application.getApplicant(),
+ userIds,
+ ""
+ );
+ }
+ }
+
+ return R.ok();
}
@Override
@@ -150,9 +242,9 @@
.or()
.eq(MeetApplication::getApplicationType, "notification");
});
- if (Objects.nonNull(vo.getMeetingDate())) {
+ if (Objects.nonNull(vo.getDate())) {
alWrapper.and(wrapper -> {
- wrapper.eq(MeetApplication::getMeetingDate, vo.getMeetingDate());
+ wrapper.eq(MeetApplication::getMeetingDate, vo.getDate());
});
}
alWrapper.orderByAsc(MeetApplication::getStartTime);
@@ -236,6 +328,114 @@
public List<MeetingSimpleDto> getMeetSummaryItems() {
return meetApplicationMapper.getMeetSummaryItems();
}
+
+ @Override
+ public List<ApproveProcess> getUpcomingMeetingReminders() {
+ List<ApproveProcess> reminders = new ArrayList<>();
+ LocalDateTime now = LocalDateTime.now();
+ List<MeetApplication> meetings = meetApplicationMapper.selectList(
+ Wrappers.<MeetApplication>lambdaQuery()
+ .eq(MeetApplication::getPublishStatus, 1)
+ .gt(MeetApplication::getStartTime, now)
+ .le(MeetApplication::getStartTime, now.plusHours(1))
+ .orderByAsc(MeetApplication::getStartTime));
+ if (meetings == null || meetings.isEmpty()) {
+ return reminders;
+ }
+ Long currentUserId = SecurityUtils.getLoginUser().getUserId();
+ Map<Integer, SysPost> postCache = new HashMap<>();
+ for (MeetApplication meeting : meetings) {
+ if (meeting.getStartTime() == null) {
+ continue;
+ }
+ List<Long> staffIds = parseParticipantStaffIds(meeting.getParticipants());
+ if (staffIds.isEmpty()) {
+ continue;
+ }
+ List<StaffOnJob> staffs = staffOnJobMapper.selectBatchIds(staffIds);
+ Map<Long, StaffOnJob> staffMap = (staffs == null) ? new HashMap<>()
+ : staffs.stream().collect(Collectors.toMap(StaffOnJob::getId, s -> s, (a, b) -> a));
+ boolean isParticipant = false;
+ List<String> participantNames = new ArrayList<>();
+ for (Long staffId : staffIds) {
+ StaffOnJob staff = staffMap.get(staffId);
+ if (staff == null) {
+ continue;
+ }
+ String display = staff.getStaffName() == null ? "" : staff.getStaffName();
+ if (staff.getSysPostId() != null) {
+ SysPost post = postCache.get(staff.getSysPostId());
+ if (post == null) {
+ post = sysPostMapper.selectPostById(staff.getSysPostId().longValue());
+ if (post != null) {
+ postCache.put(staff.getSysPostId(), post);
+ }
+ }
+ if (post != null && post.getPostName() != null && !post.getPostName().isEmpty()) {
+ display = display + " (" + post.getPostName() + ")";
+ }
+ }
+ if (!display.isEmpty()) {
+ participantNames.add(display);
+ }
+ if (!isParticipant && staff.getStaffNo() != null) {
+ SysUser user = userMapper.selectOne(
+ Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUserName, staff.getStaffNo()));
+ if (user != null && currentUserId.equals(user.getUserId())) {
+ isParticipant = true;
+ }
+ }
+ }
+ if (!isParticipant) {
+ continue;
+ }
+ String roomName = "浼氳";
+ if (meeting.getRoomId() != null) {
+ MeetingRoom room = meetingRoomMapper.selectById(meeting.getRoomId());
+ if (room != null && room.getName() != null && !room.getName().isEmpty()) {
+ roomName = room.getName();
+ }
+ }
+ ApproveProcess ap = new ApproveProcess();
+ ap.setId(100000000L + meeting.getId());
+ ap.setApproveId("浼氳鎻愰啋");
+ ap.setApproveDeptName(roomName);
+ String reason = "浼氳銆�" + meeting.getTitle() + "銆嬪皢浜� "
+ + meeting.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")) + " 寮�濮�";
+ if (!participantNames.isEmpty()) {
+ reason += "锛涘弬浼氫汉鍛橈細" + String.join("銆�", participantNames);
+ }
+ ap.setApproveReason(reason);
+ ap.setApproveUserName(meeting.getApplicant());
+ ap.setApproveTime(java.sql.Timestamp.valueOf(meeting.getStartTime()));
+ ap.setApproveTypeName("浼氳鎻愰啋");
+ reminders.add(ap);
+ }
+ return reminders;
+ }
+
+ private List<Long> parseParticipantStaffIds(String participants) {
+ List<Long> ids = new ArrayList<>();
+ if (participants == null || participants.trim().isEmpty()) {
+ return ids;
+ }
+ String cleanStr = participants.replaceAll("^\\[|\\]$", "").trim();
+ if (cleanStr.isEmpty()) {
+ return ids;
+ }
+ for (String s : cleanStr.split(",")) {
+ String val = s.trim();
+ if (val.isEmpty()) {
+ continue;
+ }
+ try {
+ ids.add(Long.valueOf(val));
+ } catch (NumberFormatException ignored) {
+ }
+ }
+ return ids;
+ }
+
}
--
Gitblit v1.9.3