MySQL锁等待超时

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

@@ -2,6 +2,7 @@ package com.sundot.airport.ledger.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysUser;
 import com.sundot.airport.common.enums.LedgerSyncFlagEnum;
@@ -192,6 +193,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_SUPERVISION_L2);
         int ins = 0, skip = 0;
         for (LedgerSupervisionProblem row : list) {
+            LambdaUpdateWrapper<LedgerSupervisionProblem> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerSupervisionProblem::getId, row.getId())
+                    .set(LedgerSupervisionProblem::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            supervisionMapper.update(null, uw);
             String src = "supervision_problem:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectedName())) { skip++; continue; }
@@ -211,11 +216,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = supervisionMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -228,6 +228,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_INTERCEPT_L2);
         int ins = 0, skip = 0;
         for (LedgerRealtimeInterception row : list) {
+            LambdaUpdateWrapper<LedgerRealtimeInterception> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerRealtimeInterception::getId, row.getId())
+                    .set(LedgerRealtimeInterception::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            interceptionMapper.update(null, uw);
             String src = "realtime_interception:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectorName())) { skip++; continue; }
@@ -253,11 +257,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = interceptionMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -270,6 +269,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_SECTEST_L2);
         int ins = 0, skip = 0;
         for (LedgerSecurityTest row : list) {
+            LambdaUpdateWrapper<LedgerSecurityTest> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerSecurityTest::getId, row.getId())
+                    .set(LedgerSecurityTest::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            securityTestMapper.update(null, uw);
             String src = "security_test:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!"未通过".equals(row.getTestResult())) { skip++; continue; }
@@ -289,11 +292,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = securityTestMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -306,6 +304,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_UNSAFE_L2);
         int ins = 0, skip = 0;
         for (LedgerUnsafeEvent row : list) {
+            LambdaUpdateWrapper<LedgerUnsafeEvent> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerUnsafeEvent::getId, row.getId())
+                    .set(LedgerUnsafeEvent::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            unsafeEventMapper.update(null, uw);
             String src = "unsafe_event:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getResponsibleName())) { skip++; continue; }
@@ -325,11 +327,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = unsafeEventMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -342,6 +339,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_SEIZURE_L2);
         int ins = 0, skip = 0;
         for (LedgerSeizureStats row : list) {
+            LambdaUpdateWrapper<LedgerSeizureStats> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerSeizureStats::getId, row.getId())
+                    .set(LedgerSeizureStats::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            seizureMapper.update(null, uw);
             String src = "seizure_stats:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectorName())) { skip++; continue; }
@@ -358,11 +359,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = seizureMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -379,6 +375,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_SEIZURE_L2);
         int ins = 0, skip = 0;
         for (LedgerRewardApproval row : list) {
+            LambdaUpdateWrapper<LedgerRewardApproval> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerRewardApproval::getId, row.getId())
+                    .set(LedgerRewardApproval::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            rewardApprovalMapper.update(null, uw);
             String src = "reward_approval:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getPersonName())) { skip++; continue; }
@@ -395,11 +395,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = rewardApprovalMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -412,6 +407,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_SVCPATROL_L2);
         int ins = 0, skip = 0;
         for (LedgerServicePatrol row : list) {
+            LambdaUpdateWrapper<LedgerServicePatrol> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerServicePatrol::getId, row.getId())
+                    .set(LedgerServicePatrol::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            servicePatrolMapper.update(null, uw);
             String src = "service_patrol:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getInspectedName())) { skip++; continue; }
@@ -430,11 +429,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = servicePatrolMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -447,6 +441,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_COMPLAINT_L2);
         int ins = 0, skip = 0;
         for (LedgerComplaint row : list) {
+            LambdaUpdateWrapper<LedgerComplaint> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerComplaint::getId, row.getId())
+                    .set(LedgerComplaint::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            complaintMapper.update(null, uw);
             String src = "complaint:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getResponsibleName())) { skip++; continue; }
@@ -458,11 +456,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = complaintMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -476,6 +469,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv3 = getIndicator(IND_TYPCASE_L3);
         int ins = 0, skip = 0;
         for (LedgerTerminalBonus row : list) {
+            LambdaUpdateWrapper<LedgerTerminalBonus> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerTerminalBonus::getId, row.getId())
+                    .set(LedgerTerminalBonus::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            terminalBonusMapper.update(null, uw);
             String src = "terminal_bonus:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getPersonName())) { skip++; continue; }
@@ -487,11 +484,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 sync_flag，避免锁等待超时
-        int updatedRows;
-        do {
-            updatedRows = terminalBonusMapper.updateSyncFlag();
-        } while (updatedRows > 0);
         return new SyncResult(ins, skip, "");
     }
 
@@ -504,6 +496,10 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
         ScoreIndicator lv2 = getIndicator(IND_EXAM_L2);
         int ins = 0, skip = 0;
         for (LedgerExamScore row : list) {
+            LambdaUpdateWrapper<LedgerExamScore> uw = new LambdaUpdateWrapper<>();
+            uw.eq(LedgerExamScore::getId, row.getId())
+                    .set(LedgerExamScore::getSyncFlag, LedgerSyncFlagEnum.ONE.getCode());
+            examScoreMapper.update(null, uw);
             String src = "exam_score:" + row.getId();
             if (existsBySrc(src)) { skip++; continue; }
             if (!hasName(row.getPersonName())) { skip++; continue; }
@@ -523,11 +519,6 @@ public class LedgerSyncServiceImpl implements ILedgerSyncService {
             scoreEventMapper.insert(e);
             ins++;
         }
-        // 分批更新 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,6 +60,5 @@
         update ledger_complaint
         set sync_flag = '1'
         where sync_flag = '0'
-        limit 1000
     </update>
 </mapper>

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

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

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

@@ -66,7 +66,6 @@
         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

@@ -56,6 +56,5 @@
         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,7 +69,6 @@
         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

@@ -80,7 +80,6 @@
         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,6 +70,5 @@
         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,7 +72,6 @@
         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

@@ -54,6 +54,5 @@
         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,7 +63,6 @@
         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">