修复验收：解决后端综合业务流程缺陷

RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/integration/dms/orchestration/AccessAuthorizationOrchestrator.java

@@ -58,6 +58,7 @@ public class AccessAuthorizationOrchestrator {
         this(null, null, null, null, null, null, null);
     }
 
+    @org.springframework.beans.factory.annotation.Autowired
     public AccessAuthorizationOrchestrator(TrainEnrollmentMapper enrollmentMapper,
                                            TrainAccommodationMapper accommodationMapper,
                                            TrainDormAuthMapper dormAuthMapper,

RuoYi-Vue/ruoyi-train/src/main/java/com/ruoyi/train/integration/dms/poller/DmsOperationPoller.java

@@ -48,25 +48,32 @@ public class DmsOperationPoller {
     public static final String ERROR_CATEGORY_DEVICE_FAILED = "DEVICE_FAILED";
     public static final String ERROR_CATEGORY_DEVICE_TIMEOUT = "DEVICE_TIMEOUT";
     public static final String ERROR_CATEGORY_UNKNOWN_STATUS = "UNKNOWN_STATUS";
-
-    private final DmsProperties dmsProperties;
-    private final IExternalOperationService externalOperationService;
-    private final DmsOperationStatusClient operationStatusClient;
-    private final ITrainDormAuthService dormAuthService;
+    @org.springframework.beans.factory.annotation.Autowired(required = false)
+    private DmsProperties dmsProperties;
+    @org.springframework.beans.factory.annotation.Autowired(required = false)
+    private IExternalOperationService externalOperationService;
+    @org.springframework.beans.factory.annotation.Autowired(required = false)
+    private DmsOperationStatusClient operationStatusClient;
+    @org.springframework.beans.factory.annotation.Autowired(required = false)
+    private ITrainDormAuthService dormAuthService;
 
     private final Set<Long> inFlightOperationIds = ConcurrentHashMap.newKeySet();
     private Clock clock = Clock.systemUTC();
 
+    public DmsOperationPoller() {
+    }
+
     public DmsOperationPoller(DmsProperties dmsProperties,
                               IExternalOperationService externalOperationService,
                               DmsOperationStatusClient operationStatusClient) {
         this(dmsProperties, externalOperationService, operationStatusClient, null);
     }
 
+    @org.springframework.beans.factory.annotation.Autowired
     public DmsOperationPoller(DmsProperties dmsProperties,
                               IExternalOperationService externalOperationService,
                               DmsOperationStatusClient operationStatusClient,
-                              ITrainDormAuthService dormAuthService) {
+                              @org.springframework.beans.factory.annotation.Autowired(required = false) ITrainDormAuthService dormAuthService) {
         this.dmsProperties = dmsProperties;
         this.externalOperationService = externalOperationService;
         this.operationStatusClient = operationStatusClient;

RuoYi-Vue/ruoyi-train/src/main/resources/mapper/train/TrainLessonMapper.xml

@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 锁定稳定教师主表行 (FOR UPDATE) -->
     <select id="lockTeacherById" resultType="com.ruoyi.train.domain.TrainTeacher">
-        select t_id, t_name, status, del_flag
+        select t_id as tId, t_name as tName, status, del_flag as delFlag
         from train_teacher
         where t_id = #{tId}
         for update
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 锁定稳定教室主表行 (FOR UPDATE) -->
     <select id="lockClassroomById" resultType="com.ruoyi.train.domain.TrainClassroomInfo">
-        select class_room_id, room_name, room_status, del_flag
+        select class_room_id as classRoomId, room_name as roomName, room_status as roomStatus, del_flag as delFlag
         from train_classroom_info
         where class_room_id = #{classRoomId}
         for update
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 锁定稳定实训场地主表行 (FOR UPDATE) -->
     <select id="lockSiteById" resultType="com.ruoyi.train.domain.TrainTrainingSite">
-        select site_id, site_name, capacity, del_flag
+        select site_id as siteId, site_name as siteName, capacity, del_flag as delFlag
         from train_training_site
         where site_id = #{siteId}
         for update