分布式锁

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

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

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/RunRecordingAndJobTaskServiceImpl.java

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.net.InetAddress;
@@ -226,6 +227,7 @@ public class RunRecordingAndJobTaskServiceImpl implements RunRecordingAndJobTask
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public void updateRunRecordingAndTask(WaitingRecord waitingRecord) {
         log.debug("---------开始查询等待工作流{}对应的数据-------------",waitingRecord);
         RunRecording runRecording = runRecordingService.findAllByRunID(waitingRecord.getRunId());

byit-myth-core/myth-admin-core/src/main/java/com/byit/util/lock/RedissonDistributedLocker.java

@@ -18,7 +18,12 @@ public class RedissonDistributedLocker implements DistributedLocker {
     @Override
     public void unlock(String lockKey) {
         RLock lock = redissonClient.getLock(lockKey);
+        try{
             lock.unlock();
+        }catch (IllegalMonitorStateException sta) {
+            log.warn("--------解锁错误{}---------",sta.getMessage());
+        }
+
     }
  
     @Override