From 5ca08b760e47a093a160b266aa88e36f9d90eca2 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Tue, 12 Dec 2023 16:31:03 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java    | 2 +-
 .../org/nl/acs/device/service/impl/DeviceServiceImpl.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
index efd759c44..f03915a47 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java
@@ -230,7 +230,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                     log.info("下发电气信号失败:" + e.getMessage());
                                     e.printStackTrace();
                                 }
-                                if (standardAutodoorDeviceDriver.getOpen() == 1) {
+                                if (standardAutodoorDeviceDriver.getOpen() == 1 && standardAutodoorDeviceDriver.getToOpen() == 1 ) {
                                     log.info("下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose());
                                     data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
                                 }
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
index d3cf55496..37c8920af 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
@@ -194,10 +194,10 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
 
         String device_code = dto.getDevice_code();
         DeviceDto deviceDto = this.findByCode(device_code);
-        if (deviceDto != null && deviceDto.getIs_delete().equals("0")
-                && !deviceDto.getDevice_id().equals(dto.getDevice_id())) {
-            throw new BadRequestException("存在相同的设备编码");
-        }
+//        if (deviceDto != null && deviceDto.getIs_delete().equals("0")
+//                && !deviceDto.getDevice_id().equals(dto.getDevice_id())) {
+//            throw new BadRequestException("存在相同的设备编码");
+//        }
 
         String currentUsername = SecurityUtils.getCurrentUsername();
         String now = DateUtil.now();