Commit fd2d782a authored by 王蔡翾's avatar 王蔡翾
Browse files

学生端实验室布局修复

parent 9648b914
......@@ -34,7 +34,7 @@ public interface TrainingRoomBookingService extends IService<TrainingRoomBooking
/** 管理员查看指定日期和时段的机位状态,已停用实训室也可查看。 */
List<TrainingRoomSeatVO> adminAvailability(String roomId, String bookingDate, Integer slotCode);
/** 学员查看运行中实训室在可预约日期、时段下的全部机位状态。 */
/** 学员查看运行中实训室指定日期、时段的布局和机位状态,不执行创建预约时的时间限制。 */
List<TrainingRoomSeatVO> availability(String roomId, String bookingDate, Integer slotCode);
/** 获取系统支持的五个固定预约时段。 */
......
......@@ -127,10 +127,11 @@ public class TrainingRoomBookingServiceImpl
@Transactional(rollbackFor = Exception.class)
public List<TrainingRoomSeatVO> availability(String roomId, String bookingDate, Integer slotCode) {
synchronizeBookingStatuses();
TrainingRoomEntity room = requireRunningRoom(roomId);
BookingTime bookingTime = validateBookingTime(room, bookingDate, slotCode);
return trainingRoomSeatMapper.selectAvailability(roomId,
bookingTime.date.format(DATE_FORMATTER), slotCode);
requireRunningRoom(roomId);
LocalDate date = parseDate(bookingDate);
// 本接口只负责查询布局和机位状态;日期范围、开放时间和时段是否开始仅在创建预约时校验。
TrainingRoomTimeSlot.fromCode(slotCode);
return trainingRoomSeatMapper.selectAvailability(roomId, date.format(DATE_FORMATTER), slotCode);
}
@Override
......
......@@ -63,6 +63,9 @@
`GET /training/room/student/{roomId}/seats?bookingDate=2026-08-31&slotCode=1`
学员端接口同样用于查看实验室布局和机位状态。只要实训室处于运行中,即使所选时段
已经开始或结束也会正常返回;日期范围、开放时间和时段是否开始仅在提交创建预约时校验。
机位位置由服务端返回,前端不再解析布局文本:
```json
......
......@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/** 管理员机位状态查询与学员预约校验边界测试。 */
/** 管理员和学员机位状态查询与创建预约校验之间的职责边界测试。 */
@ExtendWith(MockitoExtension.class)
class TrainingRoomBookingServiceImplTest {
......@@ -65,4 +65,23 @@ class TrainingRoomBookingServiceImplTest {
assertSame(expected, result);
verify(seatMapper).selectAvailability(roomId, endedDate, 1);
}
@Test
void studentAvailabilityShouldReturnLayoutForEndedSlot() {
String roomId = "room-1";
// 使用昨天可以稳定覆盖已结束时段,不依赖测试实际运行在当天几点。
String endedDate = LocalDate.now(ZoneId.of("Asia/Shanghai")).minusDays(1).toString();
TrainingRoomEntity room = new TrainingRoomEntity();
room.setId(roomId);
room.setStatus("running");
List<TrainingRoomSeatVO> expected = Collections.singletonList(new TrainingRoomSeatVO());
when(roomService.getById(roomId)).thenReturn(room);
when(seatMapper.selectAvailability(roomId, endedDate, 1)).thenReturn(expected);
List<TrainingRoomSeatVO> result = service.availability(roomId, endedDate, 1);
// 查询接口必须返回布局;“时段不可预约”的限制由createBooking统一执行。
assertSame(expected, result);
verify(seatMapper).selectAvailability(roomId, endedDate, 1);
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment