bug修复

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/LedgerSyncServiceImpl.java

@@ -211,7 +211,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        supervisionMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = supervisionMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -249,7 +253,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        interceptionMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = interceptionMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -281,7 +289,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        securityTestMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = securityTestMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -313,7 +325,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        unsafeEventMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = unsafeEventMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -342,7 +358,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        seizureMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = seizureMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -375,7 +395,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        rewardApprovalMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = rewardApprovalMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -406,7 +430,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        servicePatrolMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = servicePatrolMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -430,7 +458,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        complaintMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = complaintMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -455,7 +487,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        terminalBonusMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = terminalBonusMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -487,7 +523,11 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        examScoreMapper.updateSyncFlag();
+        // 分批更新 sync_flag，避免锁等待超时
+        int updatedRows;
+        do {
+            updatedRows = examScoreMapper.updateSyncFlag();
+        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 

airport-ledger/src/main/resources/mapper/ledger/LedgerComplaintMapper.xml

@@ -60,5 +60,6 @@
         update ledger_complaint
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 </mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerExamScoreMapper.xml

@@ -40,10 +40,10 @@
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>
         <if test="syncFlag != null and syncFlag != ''">AND sync_flag = #{syncFlag}</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
-            AND record_date &gt;= #{params.beginTime}
+            AND exam_date &gt;= #{params.beginTime}
         </if>
         <if test="params != null and params.endTime != null and params.endTime != ''">
-            AND record_date &lt;= #{params.endTime}
+            AND exam_date &lt;= #{params.endTime}
         </if>
         ORDER BY id DESC
     </select>
@@ -52,5 +52,6 @@
         update ledger_exam_score
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 </mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerLeaveSpecialMapper.xml

@@ -43,10 +43,10 @@
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</if>
         <if test="syncFlag != null and syncFlag != ''">AND sync_flag = #{syncFlag}</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
-            AND record_date &gt;= #{params.beginTime}
+            AND start_date &gt;= #{params.beginTime}
         </if>
         <if test="params != null and params.endTime != null and params.endTime != ''">
-            AND record_date &lt;= #{params.endTime}
+            AND end_date &lt;= #{params.endTime}
         </if>
         ORDER BY id DESC
     </select>

airport-ledger/src/main/resources/mapper/ledger/LedgerRealtimeInterceptionMapper.xml

@@ -66,6 +66,7 @@
         update ledger_realtime_interception
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 
     <select id="realtimeInterceptionItem"

airport-ledger/src/main/resources/mapper/ledger/LedgerRewardApprovalMapper.xml

@@ -44,10 +44,10 @@
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</if>
         <if test="syncFlag != null and syncFlag != ''">AND sync_flag = #{syncFlag}</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
-            AND record_date &gt;= #{params.beginTime}
+            AND approve_date &gt;= #{params.beginTime}
         </if>
         <if test="params != null and params.endTime != null and params.endTime != ''">
-            AND record_date &lt;= #{params.endTime}
+            AND approve_date &lt;= #{params.endTime}
         </if>
         ORDER BY id DESC
     </select>
@@ -56,5 +56,6 @@
         update ledger_reward_approval
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 </mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerSecurityTestMapper.xml

@@ -69,6 +69,7 @@
         update ledger_security_test
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 
     <select id="securityTestItemClassification"

airport-ledger/src/main/resources/mapper/ledger/LedgerSeizureStatsMapper.xml

@@ -68,10 +68,10 @@
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>
         <if test="syncFlag != null and syncFlag != ''">AND sync_flag = #{syncFlag}</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
-            AND (record_date &gt;= #{params.beginTime} OR approve_date &gt;= #{params.beginTime} OR exam_date &gt;= #{params.beginTime})
+            AND record_date &gt;= #{params.beginTime}
         </if>
         <if test="params != null and params.endTime != null and params.endTime != ''">
-            AND (record_date &lt;= #{params.endTime} OR approve_date &lt;= #{params.endTime} OR exam_date &lt;= #{params.endTime})
+            AND record_date &lt;= #{params.endTime}
         </if>
         ORDER BY id DESC
     </select>
@@ -80,6 +80,7 @@
         update ledger_seizure_stats
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 
     <select id="countByInspectorAndDateRange" resultType="int">

airport-ledger/src/main/resources/mapper/ledger/LedgerServicePatrolMapper.xml

@@ -70,5 +70,6 @@
         update ledger_service_patrol
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 </mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerSupervisionProblemMapper.xml

@@ -72,6 +72,7 @@
         update ledger_supervision_problem
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 
     <select id="supervisionProblemPosition"

airport-ledger/src/main/resources/mapper/ledger/LedgerTerminalBonusMapper.xml

@@ -42,10 +42,10 @@
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>
         <if test="syncFlag != null and syncFlag != ''">AND sync_flag = #{syncFlag}</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
-            AND record_date &gt;= #{params.beginTime}
+            AND score_date &gt;= #{params.beginTime}
         </if>
         <if test="params != null and params.endTime != null and params.endTime != ''">
-            AND record_date &lt;= #{params.endTime}
+            AND score_date &lt;= #{params.endTime}
         </if>
         ORDER BY id DESC
     </select>
@@ -54,5 +54,6 @@
         update ledger_terminal_bonus
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 </mapper>

airport-ledger/src/main/resources/mapper/ledger/LedgerUnsafeEventMapper.xml

@@ -63,6 +63,7 @@
         update ledger_unsafe_event
         set sync_flag = '1'
         where sync_flag = '0'
+        limit 1000
     </update>
 
     <select id="countSeizureStatsItem" parameterType="com.sundot.airport.ledger.domain.vo.CountQueryReqVO" resultType="com.sundot.airport.ledger.domain.vo.UnsafeItemVO">