更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java

@@ -10,7 +10,7 @@ import org.nl.acs.agv.server.AgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
 import org.nl.acs.config.AcsConfig;
 import org.nl.acs.config.server.AcsConfigService;
-import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
+import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.log.service.DeviceExecuteLogService;

acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java

@@ -12,8 +12,8 @@ import org.nl.acs.agv.server.MagicAgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
 import org.nl.acs.config.AcsConfig;
 import org.nl.acs.config.server.AcsConfigService;
-import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
-import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver;
+import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.nl.acs.device_driver.standard_storage.StandardStorageDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;

acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java

@@ -12,7 +12,7 @@ import org.nl.acs.config.AcsConfig;
 import org.nl.acs.config.server.AcsConfigService;
 import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.impl.DeviceServiceImpl;
-import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
+import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;

acs/hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

@@ -12,17 +12,15 @@ import org.nl.acs.agv.server.XianGongAgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
 import org.nl.acs.config.AcsConfig;
 import org.nl.acs.config.server.AcsConfigService;
-import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
-import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver;
+import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
-import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;
 import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.opc.DeviceType;
-import org.nl.acs.task.service.TaskService;
 import org.nl.exception.BadRequestException;
 import org.slf4j.MDC;
 import org.springframework.stereotype.Service;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java

@@ -41,7 +41,11 @@ public enum DriverTypeEnum {
 
     TRAFFIC_LIGHT(34, "traffic_light", "标准版-交通灯-欧姆龙plc", "alarmLamp"),
 
-    STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv");
+    STANDARD_RGV(35, "standard_rgv", "标准版-RGV", "rgv"),
+
+    MODBUS_AUTODOOR(36, "modbus_autodoor", "modbus-自动门", "autodoor"),
+
+    MODBUS_INSPECT_SITE(37, "modbus_inspect_site", "modbus-检测站点", "station");
 
     //驱动索引
     private int index;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java

@@ -22,7 +22,7 @@ import org.nl.acs.device_driver.ScannerDeviceDriver;
 import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
 import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
 import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver;
-import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver;
 import org.nl.acs.opc.Device;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ItemProtocol.java

@@ -0,0 +1,69 @@
+package org.nl.acs.device_driver.autodoor.modbus_autodoor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+public class ItemProtocol {
+    public static String item_heartbeat = "heartbeat";
+    public static String item_mode = "mode";
+    public static String item_action = "action";
+    public static String item_error = "error";
+    public static String item_to_command = "to_command";
+
+
+    private final ModbusAutodoorDeviceDriver driver;
+
+    public ItemProtocol(ModbusAutodoorDeviceDriver driver) {
+        this.driver = driver;
+    }
+
+    public int getHeartbeat() {
+        return this.getOpcIntegerValue(item_heartbeat);
+    }
+
+    public int getMode() {
+        return this.getOpcIntegerValue(item_mode);
+    }
+
+    public int getAction() {
+        return this.getOpcIntegerValue(item_action);
+    }
+
+    public int getError() {
+        return this.getOpcIntegerValue(item_error);
+    }
+
+    public int getToCommand() {
+        return this.getOpcIntegerValue(item_to_command);
+    }
+
+
+    public int getOpcIntegerValue(String protocol) {
+        Integer value = this.driver.getIntegeregerValue(protocol);
+        if (value != null) {
+            return value;
+        }
+        return 0;
+    }
+
+    public static List<ItemDto> getReadableItemDtos() {
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_heartbeat, "心跳", "30002"));
+        list.add(new ItemDto(item_mode, "工作状态", "30004", Boolean.TRUE));
+        list.add(new ItemDto(item_action, "动作信号", "30006"));
+        list.add(new ItemDto(item_error, "报警信号", "30008"));
+        return list;
+    }
+
+    public static List<ItemDto> getWriteableItemDtos() {
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_to_command, "作业命令", "40002", Boolean.TRUE));
+        return list;
+    }
+
+}
+

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDefination.java

@@ -0,0 +1,71 @@
+package org.nl.acs.device_driver.autodoor.modbus_autodoor;
+
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
+import org.nl.acs.opc.Device;
+import org.nl.acs.opc.DeviceType;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 自动门驱动定义
+ */
+@Service
+public class ModbusAutodoorDefination implements OpcDeviceDriverDefination {
+    @Override
+    public String getDriverCode() {
+        return "modbus_autodoor";
+    }
+
+    @Override
+    public String getDriverName() {
+        return "modbus-自动门";
+    }
+
+    @Override
+    public String getDriverDescription() {
+        return "modbus-自动门";
+    }
+
+    @Override
+    public DeviceDriver getDriverInstance(Device device) {
+        return (new ModbusAutodoorDeviceDriver()).setDevice(device).setDriverDefination(this);
+
+    }
+
+    @Override
+    public Class<? extends DeviceDriver> getDeviceDriverType() {
+        return ModbusAutodoorDeviceDriver.class;
+    }
+
+    @Override
+    public List<DeviceType> getFitDeviceTypes() {
+        List<DeviceType> types = new LinkedList<>();
+        types.add(DeviceType.conveyor);
+        return types;
+    }
+
+    @Override
+    public List<ItemDto> getReadableItemDtos() {
+        return getReadableItemDtos2();
+    }
+
+    public static List<ItemDto> getReadableItemDtos2() {
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "30002"));
+        list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "30004", Boolean.TRUE));
+        list.add(new ItemDto(ItemProtocol.item_action, "动作信号", "30006"));
+        list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "30008"));
+        return list;
+    }
+
+    @Override
+    public List<ItemDto> getWriteableItemDtos() {
+        return ItemProtocol.getWriteableItemDtos();
+    }
+
+}

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/modbus_autodoor/ModbusAutodoorDeviceDriver.java

@@ -0,0 +1,163 @@
+package org.nl.acs.device_driver.autodoor.modbus_autodoor;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
+import org.nl.acs.device.service.DeviceService;
+import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
+import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.instruction.service.InstructionService;
+import org.nl.acs.opc.Device;
+import org.nl.acs.route.service.RouteLineService;
+import org.nl.acs.task.service.TaskService;
+import org.nl.utils.SpringContextHolder;
+import org.openscada.opc.lib.da.Server;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 自动门驱动
+ */
+@EqualsAndHashCode(callSuper = true)
+@Slf4j
+@Data
+@RequiredArgsConstructor
+public class ModbusAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver {
+    protected ItemProtocol itemProtocol = new ItemProtocol(this);
+    @Autowired
+    InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
+    @Autowired
+    DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl");
+    @Autowired
+    RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl");
+    @Autowired
+    TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl");
+    String container;
+    String container_type_desc;
+    String last_container_type_desc;
+    String last_container;
+    //放货准备锁
+    String putReadyLock = null;
+    //有货标记
+    protected boolean has_goods_tag = false;
+    String devicecode;
+    int mode = 0;
+    int action = 0;
+    int error = 0;
+    Boolean iserror = false;
+
+    int move = 0;
+    int task = 0;
+    int last_action = 0;
+    int last_mode = 0;
+    int last_error = 0;
+    int last_move = 0;
+    int last_task = 0;
+
+    boolean hasVehicle = false;
+    boolean isReady = false;
+    protected int instruction_num = 0;
+    protected int instruction_num_truth = 0;
+    protected boolean hasGoods = false;
+    boolean isFold = false;
+    private String assemble_check_tag;
+    private Boolean sampleMode0;
+    private Boolean sampleMode3;
+    private Integer sampleError;
+    private Boolean sampleOnline;
+    protected String displayMessage = null;
+    public int display_message_time_out = 30000;
+    public Date display_message_time;
+    protected String current_stage_instruction_message;
+    protected String last_stage_instruction_message;
+    Integer heartbeat_tag;
+    private Date instruction_require_time = new Date();
+    private Date instruction_finished_time = new Date();
+
+    private int instruction_require_time_out;
+    boolean requireSucess = false;
+
+    private int instruction_finished_time_out;
+
+    int branchProtocol = 0;
+
+    @Override
+    public Device getDevice() {
+        return this.device;
+    }
+
+
+    @Override
+    public void execute() {
+
+        mode = this.itemProtocol.getMode();
+        action = this.itemProtocol.getAction();
+        error = this.itemProtocol.getError();
+        if (mode != last_mode) {
+        }
+        if (action != last_action) {
+        }
+        if (error != last_error) {
+            //this.execute_log.setContainer("");
+        }
+        last_action = action;
+        last_mode = mode;
+        last_error = error;
+        //message = StringFormatUtl.format("设备报警:{}", new Object[]{});
+
+//        String manual_create_task = this.getDevice().getExtraValue().get("manual_create_task").toString();
+
+    }
+
+    public synchronized String getStatus() {
+        JSONObject jo = new JSONObject();
+
+        if (action == 1) {
+            jo.put("name", this.getDevice().getDevice_code());
+            jo.put("status", "OPEN");
+
+        } else if (action == 2) {
+            jo.put("name", this.getDevice().getDevice_code());
+            jo.put("status", "CLOSE");
+
+        } else {
+            jo.put("name", this.getDevice().getDevice_code());
+            jo.put("status", "ERROR");
+        }
+        return jo.toString();
+    }
+
+
+    public void writeing(int command) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command;
+
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_command, command);
+        ReadUtil.write(itemMap, server);
+        log.info("下发PLC信号：{},{}", to_command, command);
+        System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value:" + command);
+
+    }
+
+    public synchronized void OpenOrClose(String type) {
+
+        //开门
+        if ("1".equals(type)) {
+            writeing(1);
+        } else {
+            writeing(2);
+        }
+
+    }
+
+}

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.standard_autodoor;
+package org.nl.acs.device_driver.autodoor.standard_autodoor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.standard_autodoor;
+package org.nl.acs.device_driver.autodoor.standard_autodoor;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device_driver.DeviceDriver;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.standard_autodoor;
+package org.nl.acs.device_driver.autodoor.standard_autodoor;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ItemProtocol.java

@@ -0,0 +1,106 @@
+package org.nl.acs.device_driver.inspect_site.modbus_inspect_site;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Data
+public class ItemProtocol {
+
+    public static String item_heartbeat = "heartbeat";
+    public static String item_mode = "mode";
+    public static String item_move = "move";
+    public static String item_action = "action";
+    public static String item_error = "error";
+    public static String item_task = "task";
+    public static String item_to_command = "to_command";
+    public static String item_to_target = "to_target";
+    public static String item_to_task = "to_task";
+
+    private ModbusInspectSiteDeviceDriver driver;
+
+    public ItemProtocol(ModbusInspectSiteDeviceDriver driver) {
+        this.driver = driver;
+    }
+
+    public int getHeartbeat() {
+        return this.getOpcIntegerValue(item_heartbeat);
+    }
+
+    public int getMode() {
+        return this.getOpcIntegerValue(item_mode);
+    }
+
+    public int getMove() {
+        return this.getOpcIntegerValue(item_move);
+    }
+
+    public int getAction() {
+        return this.getOpcIntegerValue(item_action);
+    }
+
+    public int getError() {
+        return this.getOpcIntegerValue(item_error);
+    }
+
+    public int getTask() {
+        return this.getOpcIntegerValue(item_task);
+    }
+
+    public int getToCommand() {
+        return this.getOpcIntegerValue(item_to_command);
+    }
+
+    public int getToTarget() {
+        return this.getOpcIntegerValue(item_to_target);
+    }
+
+    public int getToTask() {
+        return this.getOpcIntegerValue(item_to_task);
+    }
+
+    //是否有货
+    public int hasGoods(int move) {
+        return move;
+    }
+
+    Boolean isonline;
+
+    public int getOpcIntegerValue(String protocol) {
+        Integer value = this.driver.getIntegeregerValue(protocol);
+        if (value == null) {
+            log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!");
+            setIsonline(false);
+        } else {
+            setIsonline(true);
+            return value;
+        }
+        return 0;
+
+    }
+
+    public static List<ItemDto> getReadableItemDtos() {
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_heartbeat, "心跳", "30002"));
+        list.add(new ItemDto(item_mode, "工作状态", "30004", Boolean.TRUE));
+        list.add(new ItemDto(item_move, "光电开关信号", "30006"));
+        list.add(new ItemDto(item_action, "取放信号", "30008"));
+        list.add(new ItemDto(item_error, "报警信号", "30010"));
+        list.add(new ItemDto(item_task, "任务号", "30012"));
+        return list;
+    }
+
+    public static List<ItemDto> getWriteableItemDtos() {
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_to_command, "作业命令", "40002", Boolean.TRUE));
+        list.add(new ItemDto(item_to_target, "目标站", "40004"));
+        list.add(new ItemDto(item_to_task, "任务号", "40008"));
+        return list;
+    }
+
+}
+

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDefination.java

@@ -0,0 +1,74 @@
+package org.nl.acs.device_driver.inspect_site.modbus_inspect_site;
+
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
+import org.nl.acs.opc.Device;
+import org.nl.acs.opc.DeviceType;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 检测站点驱动定义
+ * 说明：该站点为普通带光电检测站点
+ */
+@Service
+public class ModbusInspectSiteDefination implements OpcDeviceDriverDefination {
+    @Override
+    public String getDriverCode() {
+        return "modbus_inspect_site";
+    }
+
+    @Override
+    public String getDriverName() {
+        return "modbus-检测站点";
+    }
+
+    @Override
+    public String getDriverDescription() {
+        return "modbus-检测站点";
+    }
+
+    @Override
+    public DeviceDriver getDriverInstance(Device device) {
+        return (new ModbusInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this);
+
+    }
+
+    @Override
+    public Class<? extends DeviceDriver> getDeviceDriverType() {
+        return ModbusInspectSiteDeviceDriver.class;
+    }
+
+    @Override
+    public List<DeviceType> getFitDeviceTypes() {
+        List<DeviceType> types = new LinkedList<>();
+        types.add(DeviceType.conveyor);
+        return types;
+    }
+
+    @Override
+    public List<ItemDto> getReadableItemDtos() {
+        return getReadableItemDtos2();
+    }
+
+    public static List<ItemDto> getReadableItemDtos2() {
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(ItemProtocol.item_heartbeat, "心跳", "30002"));
+        list.add(new ItemDto(ItemProtocol.item_mode, "工作状态", "30004", Boolean.TRUE));
+        list.add(new ItemDto(ItemProtocol.item_move, "光电开关信号", "30006"));
+        list.add(new ItemDto(ItemProtocol.item_action, "取放信号", "30008"));
+        list.add(new ItemDto(ItemProtocol.item_error, "报警信号", "30010"));
+        list.add(new ItemDto(ItemProtocol.item_task, "任务号", "30014"));
+        return list;
+    }
+
+    @Override
+    public List<ItemDto> getWriteableItemDtos() {
+        return ItemProtocol.getWriteableItemDtos();
+    }
+
+}

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/modbus_inspect_site/ModbusInspectSiteDeviceDriver.java

@@ -0,0 +1,455 @@
+package org.nl.acs.device_driver.inspect_site.modbus_inspect_site;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ReadUtil;
+import org.nl.acs.device.service.DeviceService;
+import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.RouteableDeviceDriver;
+import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
+import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.instruction.service.InstructionService;
+import org.nl.acs.instruction.service.dto.Instruction;
+import org.nl.acs.log.service.DeviceExecuteLogService;
+import org.nl.acs.opc.Device;
+import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.opc.DeviceAppServiceImpl;
+import org.nl.acs.opc.WcsConfig;
+import org.nl.acs.route.service.RouteLineService;
+import org.nl.acs.route.service.dto.RouteLineDto;
+import org.nl.acs.task.service.TaskService;
+import org.nl.acs.task.service.dto.TaskDto;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.utils.SpringContextHolder;
+import org.nl.wql.core.bean.WQLObject;
+import org.openscada.opc.lib.da.Server;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 检测站点驱动
+ */
+@Slf4j
+@Data
+@RequiredArgsConstructor
+public class ModbusInspectSiteDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver {
+    protected ItemProtocol itemProtocol = new ItemProtocol(this);
+    @Autowired
+    InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl");
+    @Autowired
+    DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl");
+    @Autowired
+    RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl");
+    @Autowired
+    TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl");
+    @Autowired
+    DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
+
+    String container;
+    String container_type_desc;
+    String last_container_type_desc;
+    String last_container;
+    //放货准备锁
+    String putReadyLock = null;
+    //有货标记
+    protected boolean has_goods_tag = false;
+
+    int mode = 0;
+    int error = 0;
+    int move = 0;
+    int task = 0;
+    int last_mode = 0;
+    int last_error = 0;
+    int last_move = 0;
+    int last_task = 0;
+    Boolean isonline = true;
+    int hasGoods = 0;
+    String message = null;
+    Boolean iserror = false;
+
+
+    boolean hasVehicle = false;
+    boolean isReady = false;
+    protected int instruction_num = 0;
+    protected int instruction_num_truth = 0;
+    boolean isFold = false;
+    private String assemble_check_tag;
+
+    protected String current_stage_instruction_message;
+    protected String last_stage_instruction_message;
+    Integer heartbeat_tag;
+    private Date instruction_require_time = new Date();
+    private Date instruction_finished_time = new Date();
+
+    private int instruction_require_time_out;
+    boolean requireSucess = false;
+
+    private int instruction_finished_time_out;
+
+    int branchProtocol = 0;
+    //备注
+    String remark;
+    //数量
+    String qty;
+    //物料
+    String material;
+    //批次
+    String batch;
+    //当前指令
+    Instruction inst = null;
+    //上次指令
+    Instruction last_inst = null;
+
+    //触摸屏手动触发任务
+    private Boolean is_has_task = false;
+
+    //申请搬运任务
+    private Boolean apply_handling = false;
+    //申请物料
+    private Boolean apply_material = false;
+
+    //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域
+    int flag;
+
+    String device_code;
+
+    @Override
+    public Device getDevice() {
+        return this.device;
+    }
+
+
+    @Override
+    public void execute() {
+        String message = null;
+        try {
+            device_code = this.getDeviceCode();
+            mode = this.itemProtocol.getMode();
+            error = this.itemProtocol.getError();
+            move = this.itemProtocol.getMove();
+            task = this.itemProtocol.getTask();
+            hasGoods = this.itemProtocol.getMove();
+
+            if (mode != last_mode) {
+                this.setRequireSucess(false);
+                logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode));
+                logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode);
+            }
+            if (move != last_move) {
+                logServer.deviceItemValue(this.device_code,"move" ,String.valueOf(move));
+                logServer.deviceExecuteLog(this.device_code,"","","信号move：" + last_move + "->" + move);
+            }
+            if (error != last_error) {
+                logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error));
+                logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + "->" + error);
+            }
+            if (task != last_task) {
+                logServer.deviceItemValue(this.device_code,"task",String.valueOf(task));
+                logServer.deviceExecuteLog(this.device_code,"","","信号task：" + last_task + "->" + task);
+            }
+
+            if (this.getApply_handling()) {
+                String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString();
+                DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
+                Device link_device = appService.findDeviceByCode(link_device_code);
+                ModbusInspectSiteDeviceDriver standardInspectSiteDevicedriver;
+                if (link_device.getDeviceDriver() instanceof ModbusInspectSiteDeviceDriver) {
+                    standardInspectSiteDevicedriver = (ModbusInspectSiteDeviceDriver) link_device.getDeviceDriver();
+//                            if(standardInspectSiteDevicedriver.getMode() != 2){
+//                                log.debug("设备未待机");
+//                                return;
+//                            }
+//                            if(standardInspectSiteDevicedriver.getMove() != 0){
+//                                log.debug("设备不满足放货条件");
+//                                return;
+//                            }
+
+                    //如果目标设备申请叫料 则允许生成任务
+                    if (standardInspectSiteDevicedriver.getApply_material()) {
+                        TaskDto dto = new TaskDto();
+                        String now = DateUtil.now();
+                        dto.setTask_id(IdUtil.simpleUUID());
+                        dto.setCreate_by(this.getDevice().getDevice_code());
+                        dto.setUpdate_by(this.getDevice().getDevice_code());
+                        dto.setStart_point_code(this.getDevice().getDevice_code());
+
+                        String taskcode = CodeUtil.getNewCode("TASK_NO");
+                        dto.setTask_code("-" + taskcode);
+                        dto.setTask_status("0");
+                        dto.setPriority("101");
+//                        RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
+//                        String next_device_codecode = jo.getNext_device_code();
+//                                if(StrUtil.isEmpty(next_device_codecode)){
+//                                    throw new RuntimeException("该设备未找到对应路由");
+//                                }
+                        dto.setNext_point_code(this.getDeviceCode());
+                        dto.setUpdate_time(now);
+                        dto.setCreate_time(now);
+
+                        WQLObject wo = WQLObject.getWQLObject("acs_task");
+                         JSONObject json = (JSONObject) JSONObject.toJSON(dto);
+
+                        wo.insert(json);
+                        standardInspectSiteDevicedriver.setApply_material(false);
+                    }
+                }
+                this.setApply_handling(false);
+            }
+
+        } catch (Exception var17) {
+            return;
+        }
+
+        if (!this.itemProtocol.getIsonline()) {
+            this.setIsonline(false);
+            this.setIserror(true);
+            message = "信号量同步异常";
+            //未联机
+        } else if (mode == 0) {
+            this.setIsonline(false);
+            this.setIserror(true);
+            message = "未联机";
+            //有报警
+        } else if (error != 0) {
+            this.setIsonline(false);
+            this.setIserror(true);
+            message = "有报警";
+            //无报警
+        } else {
+            this.setIsonline(true);
+            this.setIserror(false);
+            message = "";
+            Instruction instruction = null;
+            List toInstructions;
+            switch (mode) {
+                case 1:
+                    log.debug("设备运转模式:等待工作");
+                    return;
+                case 2:
+                    //申请任务
+//                    if (this.getApply_handling()) {
+//                        String link_device_code = this.getDevice().getExtraValue().get("link_device_code").toString();
+//                        DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
+//                        Device link_device =  appService.findDeviceByCode(link_device_code);
+//                        StandardInspectSiteDeviceDriver standardInspectSiteDevicedriver;
+//                        if(link_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
+//                            standardInspectSiteDevicedriver = (StandardInspectSiteDeviceDriver) link_device.getDeviceDriver();
+//                            if(standardInspectSiteDevicedriver.getMode() != 2){
+//                                log.debug("设备未待机");
+//                                return;
+//                            }
+//                            if(standardInspectSiteDevicedriver.getMove() != 0){
+//                                log.debug("设备不满足放货条件");
+//                                return;
+//                            }
+//
+//                            //如果目标设备申请叫料 则允许生成任务
+//                            if(standardInspectSiteDevicedriver.getApply_material()){
+//                                TaskDto dto = new TaskDto();
+//                                String now = DateUtil.now();
+//                                dto.setTask_id(IdUtil.simpleUUID());
+//                                dto.setCreate_by(this.getDevice().getDevice_code());
+//                                dto.setUpdate_by(this.getDevice().getDevice_code());
+//                                dto.setStart_point_code(this.getDevice().getDevice_code());
+//
+//                                String taskcode = CodeGenerateUtil.getNewCode("TASK_NO");
+//                                dto.setTask_code("-"+taskcode);
+//                                dto.setTask_status("0");
+//                                dto.setPriority("101");
+//                                RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
+//                                String next_device_codecode = jo.getNext_device_code();
+//                                if(StrUtil.isEmpty(next_device_codecode)){
+//                                    throw new RuntimeException("该设备未找到对应路由");
+//                                }
+//                                dto.setNext_point_code(next_device_codecode);
+//                                dto.setUpdate_time(now);
+//                                dto.setCreate_time(now);
+//
+//                                WQLObject wo = WQLObject.getWQLObject("acs_task");
+//                                 JSONObject json = (JSONObject) JSONObject.toJSON(dto);
+
+//                                wo.insert(json);
+//                                standardInspectSiteDevicedriver.setApply_material(false);
+//                            }
+//                        }
+//                        this.setApply_handling(false);
+//                    }
+
+                    if (material.length() > 0 && qty.length() > 0 && !requireSucess) {
+                        this.instruction_require(container);
+                    }
+            }
+
+            switch (flag) {
+                //取货完成
+                case 1:
+                    writing(2);
+                    return;
+                //放货完成
+                case 2:
+                    writing(3);
+                    return;
+
+            }
+
+        }
+        last_mode = mode;
+        last_error = error;
+        last_move = move;
+        last_task = task;
+
+    }
+
+
+    public boolean exe_error() {
+        if (this.error == 0) {
+            return true;
+        } else {
+            log.debug("设备报警");
+            return false;
+        }
+    }
+
+    protected void thingToNothing() {
+        log.debug("从有货到无货 清理数据");
+        this.set_last_container(container, container_type_desc);
+    }
+
+    public void set_last_container(String barcode, String type_desc) {
+        this.set_last_container(barcode);
+        this.set_last_container_type_desc(type_desc);
+    }
+
+    public void set_last_container(String barcode) {
+    }
+
+    public void set_last_container_type_desc(String type) {
+    }
+
+    public boolean exe_business() {
+        return true;
+    }
+
+    protected void executing(Instruction instruction) {
+        this.executing(1, instruction, "");
+    }
+
+    public void executing(int command, Instruction instruction, String appendMessage) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command;
+        String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_target;
+        String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_task;
+        if (appendMessage == null) {
+            appendMessage = "";
+        }
+        if (instruction != null) {
+            instruction_num = Integer.parseInt(instruction.getInstruction_code());
+        }
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_command, 1);
+        itemMap.put(to_task, instruction_num);
+        ReadUtil.write(itemMap, server);
+
+    }
+
+    public void executing(Server server, Map<String, Object> itemMap) {
+        ReadUtil.write(itemMap, server);
+    }
+
+    public void writing(int command) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command;
+
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        itemMap.put(to_command, command);
+        ReadUtil.write(itemMap, server);
+
+    }
+
+    public void writing(int type, int command) {
+        String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_command;
+        String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_target;
+        String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+                + "." + ItemProtocol.item_to_task;
+        String opcservcerid = this.getDevice().getOpc_server_id();
+        Server server = ReadUtil.getServer(opcservcerid);
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        if (type == 1) {
+            itemMap.put(to_command, command);
+        } else if (type == 2) {
+            itemMap.put(to_target, command);
+
+        } else if (type == 3) {
+            itemMap.put(to_task, command);
+        }
+        ReadUtil.write(itemMap, server);
+
+    }
+
+    public boolean instruction_require(String container_code) {
+        return instruction_require(container_code, WcsConfig.task_container_type_default_desc);
+    }
+
+    /**
+     * 请求指令
+     *
+     * @param container_code
+     * @param container_type
+     */
+    public synchronized boolean instruction_require(String container_code, String container_type) {
+        Date date = new Date();
+        if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+            log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out);
+            return false;
+        } else {
+            this.instruction_require_time = date;
+            TaskDto dto = new TaskDto();
+            String now = DateUtil.now();
+            dto.setTask_id(IdUtil.simpleUUID());
+            dto.setCreate_by(this.getDevice().getDevice_code());
+            dto.setUpdate_by(this.getDevice().getDevice_code());
+            dto.setStart_point_code(this.getDevice().getDevice_code());
+            dto.setVehicle_code(container_code);
+            dto.setVehicle_type(container_type);
+
+            String taskcode = CodeUtil.getNewCode("TASK_NO");
+            dto.setTask_code("-" + taskcode);
+            dto.setTask_status("0");
+            dto.setPriority("101");
+            RouteLineDto jo = routelineserver.findByCode(this.getDevice().getDevice_code());
+            String next_device_codecode = jo.getNext_device_code();
+            if (StrUtil.isEmpty(next_device_codecode)) {
+                throw new RuntimeException("该设备未找到对应路由");
+            }
+            dto.setNext_point_code(next_device_codecode);
+            dto.setUpdate_time(now);
+            dto.setCreate_time(now);
+
+            WQLObject wo = WQLObject.getWQLObject("acs_task");
+             JSONObject json = (JSONObject) JSONObject.toJSON(dto);
+
+            wo.insert(json);
+            requireSucess = false;
+            return true;
+        }
+    }
+
+
+}

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/ItemProtocol.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.standard_inspect_site;
+package org.nl.acs.device_driver.inspect_site.standard_inspect_site;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/StandardInspectSiteDefination.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.standard_inspect_site;
+package org.nl.acs.device_driver.inspect_site.standard_inspect_site;
 
 import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
 import org.nl.acs.device_driver.DeviceDriver;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/inspect_site/standard_inspect_site/StandardInspectSiteDeviceDriver.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device_driver.standard_inspect_site;
+package org.nl.acs.device_driver.inspect_site.standard_inspect_site;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java

@@ -135,7 +135,7 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen
 
     public void writing(int command) {
         String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
-                + "." + org.nl.acs.device_driver.standard_inspect_site.ItemProtocol.item_to_command;
+                + "." + org.nl.acs.device_driver.inspect_site.standard_inspect_site.ItemProtocol.item_to_command;
 
         String opcservcerid = this.getDevice().getOpc_server_id();
         Server server = ReadUtil.getServer(opcservcerid);

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java

@@ -12,7 +12,7 @@ import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
-import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.instruction.service.dto.Instruction;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;

acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.config.AcsConfig;
 import org.nl.acs.config.server.AcsConfigService;
 import org.nl.acs.device.service.DeviceService;
-import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
+import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver;
 import org.nl.acs.device_driver.standard_conveyor_monitor.StandardCoveyorMonitorDeviceDriver;
 import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver;

acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -21,7 +21,7 @@ import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.impl.DeviceServiceImpl;
 import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver;
 import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
-import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;
 import org.nl.acs.opc.Device;

acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

@@ -20,7 +20,7 @@ import org.nl.acs.device.service.DeviceService;
 import org.nl.acs.device.service.StorageCellService;
 import org.nl.acs.device.service.dto.DeviceAssignedDto;
 import org.nl.acs.device.service.impl.DeviceServiceImpl;
-import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.service.InstructionService;
@@ -29,7 +29,6 @@ import org.nl.acs.instruction.service.dto.InstructionDto;
 import org.nl.acs.opc.Device;
 import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.opc.DeviceAppServiceImpl;
-import org.nl.acs.opc.DeviceType;
 import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.route.service.dto.RouteLineDto;
 import org.nl.acs.task.service.TaskFeedbackService;

acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java

@@ -8,13 +8,13 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.device_driver.standard_autodoor.StandardAutodoorDeviceDriver;
+import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver;
 import org.nl.acs.device_driver.standard_conveyor_control.StandardCoveyorControlDeviceDriver;
 import org.nl.acs.device_driver.standard_conveyor_control_with_plcscanner.StandardCoveyorControlWithPlcScannerDeviceDriver;
 import org.nl.acs.device_driver.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
 import org.nl.acs.device_driver.standard_conveyor_monitor.StandardCoveyorMonitorDeviceDriver;
 import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver;
-import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.nl.acs.device_driver.standard_rgv.StandardRGVDeviceDriver;
 import org.nl.acs.device_driver.standard_scanner.StandardScannerDeviceDriver;

acs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java

@@ -9,7 +9,7 @@ import org.nl.acs.config.AcsConfig;
 import org.nl.acs.config.server.AcsConfigService;
 import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver;
 import org.nl.acs.device_driver.standard_emptypallet_site.StandardEmptyPalletSiteDeviceDriver;
-import org.nl.acs.device_driver.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device_driver.inspect_site.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.device_driver.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;