From b94e1aa86e6aa2a73c84752fc5cb3024d6bc538b Mon Sep 17 00:00:00 2001
From: songxiaopeng <1393756821@qq.com>
Date: Fri, 15 Mar 2024 17:44:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java    | 6 +++---
 .../org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 783645b..2902ece 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -186,11 +186,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         // 找到当前的设备
         String deviceCode = param.getString("device_code");
         String requestNo = param.getString("requestNo");
-        RLock lock = redissonClient.getLock(deviceCode);
+        SchBasePoint basePoint = pointService.getById(deviceCode);
+        String configCode = basePoint.getRegion_code() + "QLTask";
+        RLock lock = redissonClient.getLock(configCode);
         boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
         try {
             if (tryLock) {
-                SchBasePoint basePoint = pointService.getById(deviceCode);
                 if (ObjectUtil.isEmpty(basePoint)) {
                     throw new BadRequestException("点位错误!");
                 }
@@ -231,7 +232,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         return response;
                     }
                 }
-                String configCode = basePoint.getRegion_code() + "QLTask";
                 // 组织参数
                 param.put("config_code", configCode);
                 taskService.apply(param);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
index 506c8fc..29c4e60 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java
@@ -63,7 +63,7 @@ public class FJQLTask extends AbstractTask {
     @Autowired
     private IPdmBdProductionProcessTrackingService processTrackingService;
     @Override
-    protected synchronized void create() throws BadRequestException {
+    protected void create() throws BadRequestException {
         // 获取任务
         List<SchBaseTask> tasks = taskService.findTasksByTaskStatus(TASK_CONFIG_CODE, TaskStatus.APPLY);
         // 配置信息