1、修正排班时内部lineXLatch锁释放逻辑

徐烜
1 parent b62deb3e
Showing 1 changed file with 40 additions and 33 deletions
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
@@ -88,43 +88,50 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
     public SchedulePlan save(SchedulePlan schedulePlan) {
         ReentrantLock lineXLatch = getLineXLatch(schedulePlan.getXl().getId());
+
         try {
-            if (lineXLatch.tryLock(1, TimeUnit.SECONDS)) {
-                // pre、如果排班的数据之前已经有了，删除之前的数据
-                Date startPre = new Date();
-                scheduleRuleService.deleteSchedulePlanInfo(
-                        schedulePlan.getXl().getLineCode(),
-                        schedulePlan.getScheduleFromTime(),
-                        schedulePlan.getScheduleToTime());
-                Date endPre = new Date();
-                logger.info("删除数据 {} ms --->", endPre.getTime() - startPre.getTime());
-
-                // core、生成排班计划
-                DroolsSchedulePlan droolsSchedulePlan = new DroolsSchedulePlan(
-                        schedulePlan,
-                        lineRepository, scheduleRule1FlatRepository,
-                        ttInfoRepository, ttInfoDetailRepository,
-                        carConfigInfoRepository, employeeConfigInfoRepository,
-                        rerunRuleRepository, businessRepository,
-                        scheduleRuleService,
-                        preKBase, coreKBase,
-                        logger
-                );
-                droolsSchedulePlan.generatePlan();
-
-                return new SchedulePlan();
-            } else {
-                throw new ScheduleException("当前线路正在排班，请稍后再操作...");
-            }
-        } catch (Exception exp) {
-            throw new RuntimeException(exp);
-        } finally {
-            try {
-                lineXLatch.unlock();
-            } catch (Exception exp2) {
+            if (lineXLatch.tryLock(10, TimeUnit.SECONDS)) {
+                try {
+                    // pre、如果排班的数据之前已经有了，删除之前的数据
+                    Date startPre = new Date();
+                    scheduleRuleService.deleteSchedulePlanInfo(
+                            schedulePlan.getXl().getLineCode(),
+                            schedulePlan.getScheduleFromTime(),
+                            schedulePlan.getScheduleToTime());
+                    Date endPre = new Date();
+                    logger.info("删除数据 {} ms --->", endPre.getTime() - startPre.getTime());
+
+                    // core、生成排班计划
+                    DroolsSchedulePlan droolsSchedulePlan = new DroolsSchedulePlan(
+                            schedulePlan,
+                            lineRepository, scheduleRule1FlatRepository,
+                            ttInfoRepository, ttInfoDetailRepository,
+                            carConfigInfoRepository, employeeConfigInfoRepository,
+                            rerunRuleRepository, businessRepository,
+                            scheduleRuleService,
+                            preKBase, coreKBase,
+                            logger
+                    );
+                    droolsSchedulePlan.generatePlan();
+
+                    return new SchedulePlan();
+
+                } catch (Exception exp) {
+                    throw new RuntimeException(exp);
+
+                } finally {
+                    lineXLatch.unlock();
+                }
+            } else {
+                throw new RuntimeException("当前线路[" + schedulePlan.getXl().getName() + "]正在排班，请稍后再操作...");
             }
+        } catch (InterruptedException exp) {
+            // 如果线程在等待期间被中断
+            System.err.println(Thread.currentThread().getName() + " 在等待锁时被中断。");
+            Thread.currentThread().interrupt(); // 重新中断线程
+            throw new RuntimeException(exp);
         }
     }