rev 对接工位信号写入

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java

@@ -42,6 +42,9 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class ManipulatorAgvStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, FeedLmsRealFailed {
     protected ItemProtocol itemProtocol = new ItemProtocol(this);
+
+    protected ToCommandControl toCommandControl = new ToCommandControl(this);
+
     @Autowired
     DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
     @Autowired
@@ -99,6 +102,10 @@ public class ManipulatorAgvStationDeviceDriver extends AbstractOpcDeviceDriver i
         return this.device;
     }
 
+    public ToCommandControl getToCommandControl() {
+        return this.toCommandControl;
+    }
+
     /**
      * 请求成功标记
      */
@@ -210,30 +217,38 @@ public class ManipulatorAgvStationDeviceDriver extends AbstractOpcDeviceDriver i
         this.setRequireSucess(false);
     }
 
-    public void writing(int command) {
+    public void writing(int command){
-        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+//        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + org.nl.acs.device_driver.two_conveyor.hongxiang_conveyor.ItemProtocol.item_to_command;
+//                + "." + org.nl.acs.device_driver.two_conveyor.hongxiang_conveyor.ItemProtocol.item_to_command;
-        Map<String, Object> itemMap = new HashMap<String, Object>();
+//        Map<String, Object> itemMap = new HashMap<String, Object>();
-        itemMap.put(to_command, command);
+//        itemMap.put(to_command, command);
-        LuceneLogDto logDto = LuceneLogDto.builder()
+//        LuceneLogDto logDto = LuceneLogDto.builder()
-                .device_code(device_code)
+//                .device_code(device_code)
-                .content("下发电气信号:" + itemMap)
+//                .content("下发电气信号:" + itemMap)
-                .build();
+//                .build();
-        logDto.setLog_level(3);
+//        logDto.setLog_level(3);
-        luceneExecuteLogService.deviceExecuteLog(logDto);
+//        luceneExecuteLogService.deviceExecuteLog(logDto);
-        try {
+//        try {
-            this.checkcontrol(itemMap);
+//            this.checkcontrol(itemMap);
-        } catch (Exception e) {
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            try {
+//                this.checkcontrol(itemMap);
+//            } catch (Exception e1) {
+//                e1.printStackTrace();
+//            }
+//        }
+
+        try{
+            this.toCommandControl.control(command);
+        } catch (Exception e){
             e.printStackTrace();
-            try {
-                this.checkcontrol(itemMap);
-            } catch (Exception e1) {
-                e1.printStackTrace();
-            }
         }
     }
 
-    @Override
+
+
+        @Override
     public JSONObject getDeviceStatusName() {
         JSONObject jo = new JSONObject();
         String mode = "";

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ToCommandControl.java

@@ -0,0 +1,31 @@
+package org.nl.acs.device_driver.two_conveyor.manipulator_agv_station;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import org.nl.acs.device_driver.driver.ItemValue;
+import org.nl.acs.device_driver.stacker.standard_stacker.ItemProtocol;
+import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ToCommandControl {
+
+    private ManipulatorAgvStationDeviceDriver driver;
+
+    public ToCommandControl(ManipulatorAgvStationDeviceDriver driver) {
+        this.driver = driver;
+    }
+
+    public void control(int command) 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.getOpcServer() + "." + this.driver.getOpcPlc() + "." + this.driver.getDevice().getDevice_code()
+                + ".to_command";
+        Object obj = command;
+        itemMap.put(to_param, obj);
+        this.driver.checkcontrol(itemMap);
+    }
+
+}