分布式锁

byit-myth-core/myth-admin-core/src/main/java/com/byit/factory/DaemonScanThreadRunHelperRedisLock.java

@@ -42,8 +42,7 @@ public class DaemonScanThreadRunHelperRedisLock extends BaseDaemonScanThreadRunH
                 Long sleepTime = 0L;
                 try{
                     //加锁  60秒后超时
-                    boolean trlock = RedissLockUtil.trlock(lockName, TimeUnit.SECONDS, 1);
-                    if (trlock) {
+                    if (RedissLockUtil.trlock(lockName, TimeUnit.SECONDS, 1)) {
                         log.debug("------------{},加锁成功，锁名称为{}----------",threadName,lockName);
                         dateAligned(CYCLE_INTERVAL,threadName);
                         //调用业务操作

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/MakeUpFlowThreadRunHelper.java

@@ -57,21 +57,15 @@ public class MakeUpFlowThreadRunHelper extends BaseThreadRunHelper {
          */
         Map<Integer, WaitingRecord> nextRunFlow = allByTriggerTime.stream()
                 .collect(Collectors.toMap(WaitingRecord::getFlowId, Function.identity(), BinaryOperator.minBy(Comparator.comparingInt(WaitingRecord::getWaitOrder))));
-        Random random = new Random();
-        nextRunFlow.forEach((key,value) ->{
-            /*保证数据为串行*/
-            try {
-                Thread.sleep(random.nextInt(101)+100);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+
+        for (WaitingRecord value : nextRunFlow.values()) {
             boolean runRecordingIsRunning = runRecordingService.findRunRecordingIsRunning(value.getFlowId());
             log.info("-------{}的运行状态为{}",value,runRecordingIsRunning);
             log.info("==================================================的运行状态为{}======================================" ,runRecordingIsRunning);
             if(!runRecordingIsRunning){
                 runRecordingAndJobTaskService.updateRunRecordingAndTask(value);
             }
-        });
+        }
 
         return UNIVERSAL_WAIT_TIME;
     }