From cbf79f3ecca1c8d930001af7d62c7576bcb2495b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Fri, 22 Dec 2023 18:16:12 +0800
Subject: [PATCH] =?UTF-8?q?redisson=E9=94=81=E6=B7=BB=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/erp/controller/SDNYMainProcessController.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
index 1c40c2fc..130afaf6 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
@@ -38,6 +38,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -500,7 +501,7 @@ public class SDNYMainProcessController extends AbstractController {
         boolean isLock = false;
         RLock lock = redisson.getLock(lockKey);
         try {
-            isLock = lock.tryLock();
+            isLock = lock.tryLock(600, TimeUnit.SECONDS);
 
             if (!isLock) {
                 log.info("当前已有线程获取到锁");