blp/railwaysystem
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试住宿：覆盖跨计划床位时间冲突与并发分配

Browse Source
This commit is contained in:
wangzhibiao committed 2026-09-21 16:14:27 +08:00
1 parent fbfec1a2ec
commit b0917fc36f
5 files changed
+857 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

RuoYi-Vue/ruoyi-admin/src/test/java/com/ruoyi/web/controller/train/DmsConsistencyHardeningPackageA1Test.java
+16 -1
View File
@@ -127,6 +127,7 @@ public class DmsConsistencyHardeningPackageA1Test {
setPrivateField(accommodationService, "trainAccommodationMapper", createMockAccommodationMapper());
setPrivateField(accommodationService, "trainEnrollmentMapper", createMockEnrollmentMapper());
setPrivateField(accommodationService, "trainDormitoryInfoMapper", createMockDormitoryInfoMapper());
setPrivateField(accommodationService, "trainClassPlanMapper", createMockClassPlanMapper());
orchestrator = new AccessAuthorizationOrchestrator(
createMockEnrollmentMapper(),
@@ -756,6 +757,20 @@ public class DmsConsistencyHardeningPackageA1Test {
&& a.getAccommodationStatus() != null && (a.getAccommodationStatus() == 0 || a.getAccommodationStatus() == 1))
.count();
}
if ("countOverlappingActiveBedReservations".equals(name)) {
String dormId = (String) args[0];
String bedNo = (String) args[1];
Long excludeId = (Long) args[4];
if (dormId == null || bedNo == null || bedNo.trim().isEmpty()) return 0;
return (int) accommodationDb.values().stream()
.filter(a -> (excludeId == null || !excludeId.equals(a.getAccommodationId()))
&& dormId.equals(a.getDormId()) && bedNo.equals(a.getBedNo())
&& a.getAccommodationStatus() != null && (a.getAccommodationStatus() == 0 || a.getAccommodationStatus() == 1))
.count();
}
if ("countUnresolvedActiveBedReservations".equals(name)) {
return 0;
}
if ("countActiveByDormId".equals(name)) {
String dormId = (String) args[0];
return (int) accommodationDb.values().stream()
@@ -952,7 +967,7 @@ public class DmsConsistencyHardeningPackageA1Test {
getClass().getClassLoader(),
new Class<?>[]{TrainDormitoryInfoMapper.class},
(proxy, method, args) -> {
if ("selectTrainDormitoryInfoByDormId".equals(method.getName())) {
if ("selectTrainDormitoryInfoByDormId".equals(method.getName()) || "selectTrainDormitoryInfoForUpdate".equals(method.getName())) {
String dormId = (String) args[0];
TrainDormitoryInfo d = new TrainDormitoryInfo();
d.setDormId(dormId);