From 216cd5540f8e2ef5bd257abc5eee8b829fb0b660 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Tue, 2 Jul 2024 09:59:19 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=97=A8=E5=86=99=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardAutodoorDeviceDriver.java         | 17 +++++-------
 .../ToDoorCommandControl.java                 | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ToDoorCommandControl.java

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java
index d7152a8fd..8314b69aa 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java
@@ -30,6 +30,7 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, DeviceStageMonitor {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
+    protected ToDoorCommandControl toDoorCommandControl = new ToDoorCommandControl(this);
     DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
     @Autowired
     LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean(LuceneExecuteLogService.class);
@@ -85,22 +86,16 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
 
 
     public void writing(String param, String value) {
-        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + param;
-        Map<String, Object> itemMap = new HashMap<String, Object>();
-        itemMap.put(to_param, Integer.parseInt(value));
+//        String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+//                + "." + param;
+//        Map<String, Object> itemMap = new HashMap<String, Object>();
+//        itemMap.put(to_param, Integer.parseInt(value));
 
         try {
-            this.checkcontrol(itemMap);
+            this.toDoorCommandControl.control(param,value);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        LuceneLogDto logDto = LuceneLogDto.builder()
-                .device_code(device_code)
-                .content("下发门信号:" + itemMap)
-                .build();
-        logDto.setLog_level(4);
-        luceneExecuteLogService.deviceExecuteLog(logDto);
     }
 
     public void writing(String param, int command) {
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ToDoorCommandControl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ToDoorCommandControl.java
new file mode 100644
index 000000000..48839fca8
--- /dev/null
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ToDoorCommandControl.java
@@ -0,0 +1,27 @@
+package org.nl.acs.device_driver.autodoor.standard_autodoor;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ToDoorCommandControl {
+
+    private StandardAutodoorDeviceDriver driver;
+
+    public ToDoorCommandControl(StandardAutodoorDeviceDriver driver){
+        this.driver = driver;
+    }
+
+    public void control(String param, String value) throws Exception {
+//        ItemValue[] itemValues = new ItemValue[]{new ItemValue(this.driver.getItem(ItemProtocol.item_to_command), command)};
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        String to_param = this.driver.getDevice().getOpc_server_code() + "." + this.driver.getDevice().getOpc_plc_code() + "." + this.driver.getDevice().getDevice_code()
+                + "."+ param;
+        itemMap.put(to_param, Integer.parseInt(value));
+        try {
+            this.driver.checkcontrol(itemMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}