From f69d595cfd94940544d8d6a780c207be35abe825 Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 12 Dec 2024 09:00:16 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E8=87=AA=E5=8A=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/agv/rest/XianGongAgvController.java | 14 + .../nl/acs/agv/server/XianGongAgvService.java | 32 ++ .../server/impl/XianGongAgvServiceImpl.java | 90 ++++ .../device/device_driver/DriverTypeEnum.java | 3 +- .../standard_autodoor/ItemProtocol.java | 78 ++-- .../StandardAutodoorDefinition.java | 17 +- .../StandardAutodoorDeviceDriver.java | 216 ++++------ .../service/impl/StageServiceImpl.java | 8 +- .../src/views/acs/device/config.vue | 2 + .../acs/device/driver/standard_autodoor.vue | 389 ++++++++++++++++++ 10 files changed, 653 insertions(+), 196 deletions(-) create mode 100644 acs2/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java index 2d21d63..5180dd7 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java @@ -55,5 +55,19 @@ public class XianGongAgvController { return new ResponseEntity<>(agvService.releaseBlockGroup(requestParam), HttpStatus.OK); } + @PostMapping ("/controlDoor") + @Log("请求开/关自动门") + @ApiOperation("请求开/关自动门") + public ResponseEntity controlDoor(@RequestBody JSONObject requestParam) { + return new ResponseEntity<>(agvService.controlDoor(requestParam), HttpStatus.OK); + } + + @PostMapping ("/doorStateList") + @Log("查询自动门状态") + @ApiOperation("查询自动门状态") + public ResponseEntity doorStateList(@RequestBody JSONObject requestParam) { + return new ResponseEntity<>(agvService.doorStateList(requestParam), HttpStatus.OK); + } + } diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java index 5a21dbc..f817781 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/XianGongAgvService.java @@ -174,4 +174,36 @@ public interface XianGongAgvService { */ public UnifiedResponse sendOrderStopToXZ(JSONObject requestParam); + /** + * 请求开/关自动门 + * @param requestParam { + * doorName: 自动门id, + * state: 0-关门，1-开门 + * } + * @return JSONObject：{ + * result:0-成功, + * message: 操作成功 + * } + */ + public JSONObject controlDoor(JSONObject requestParam); + + /** + * 查询门状态 + * @param requestParam: { + * doorNameList:["自动门id"] + * } + * @return JSONObject: { + * result: 0 + * message: 操作成功 + * data : [ + * { + * doorName: 设备id + * state: 门状态：2-门完全打开 3-门正在打开中 + * msg: 状态异常时提示 + * timestamp：时间戳 + * } + * ] + * } + */ + public JSONObject doorStateList(JSONObject requestParam); } diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index 256b0d1..450bf61 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java @@ -14,6 +14,7 @@ import org.nl.acs.agv.server.AgvWaitUtil; 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.device_driver.basedriver.standard_autodoor.StandardAutodoorDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_conveyor_control.StandardCoveyorControlDeviceDriver; import org.nl.acs.device_driver.basedriver.standard_storage.StandardStorageDeviceDriver; import org.nl.acs.device_driver.lamp_three_color.LampThreecolorDeviceDriver; @@ -984,6 +985,95 @@ public class XianGongAgvServiceImpl implements XianGongAgvService { return xgHttpUtil.sendPostRequest(path, json); } + @Override + public JSONObject controlDoor(JSONObject requestParam) { + log.info("仙工AGV请求开/关自动门，请求参数 - {}", requestParam); + JSONObject result = new JSONObject(); + + String doorName = requestParam.getString("doorName"); + Device device = deviceAppService.findDeviceByCode(doorName); + if (ObjectUtil.isEmpty(device)) { + throw new BadRequestException("设备号 " + doorName + " 不存在！"); + } + + // 0-关门，1-开门 + String state = requestParam.getString("state"); + StandardAutodoorDeviceDriver driver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); + + if (state.equals("1")) { + // 给自动门写开门 + String[] key = {"toOpen"}; + Integer[] value = {1}; + driver.writing(Arrays.asList(key),Arrays.asList(value)); + + // 判断是否在打开 + if (driver.getToOpen() == 1) { + result.put("result", 0); + result.put("message", "操作成功"); + } else { + result.put("result", -1); + result.put("message", "操作失败:电气信号未改变!"); + } + } else if (state.equals("0")) { + // 给自动门写关门 + String[] key = {"toClose"}; + Integer[] value = {1}; + driver.writing(Arrays.asList(key),Arrays.asList(value)); + + // 判断是否在打开 + if (driver.getToClose() == 1) { + result.put("result", 0); + result.put("message", "操作成功"); + } else { + result.put("result", -1); + result.put("message", "操作失败:电气信号未改变!"); + } + } else { + result.put("result", -1); + result.put("message", "操作失败:下发参数有误！"); + } + + log.info("仙工AGV请求开/关自动门，返回参数 - {}", result); + return result; + } + + @Override + public JSONObject doorStateList(JSONObject requestParam) { + log.info("仙工AGV查询门状态，请求参数 - {}", requestParam); + JSONObject result = new JSONObject(); + + String[] doorNameLists = requestParam.getJSONArray("doorNameList").getString(0).split(","); + + JSONArray data = new JSONArray(); + for (String name : doorNameLists) { + JSONObject jsonDevice = new JSONObject(); + jsonDevice.put("doorName", name); + jsonDevice.put("msg", ""); + jsonDevice.put("timestamp", ""); + + // 查询设备 + Device device = deviceAppService.findDeviceByCode(name); + if (ObjectUtil.isEmpty(device)) { + throw new BadRequestException("设备号 " + name + " 不存在！"); + } + // 查询驱动判断状态 + StandardAutodoorDeviceDriver driver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); + // 判断门是否完全打开 + if (driver.getOpen() == 1 && driver.getClose() == 0 && driver.getToOpen() == 0 && driver.getToClose() == 0) { + jsonDevice.put("state", "2"); + } else { + jsonDevice.put("state", "3"); + } + data.add(jsonDevice); + } + result.put("result", 0); + result.put("message", "操作成功!"); + result.put("data", data); + + log.info("仙工AGV查询门状态，返回参数 - {}", result); + return result; + } + /** * 叉车运单动作块 * diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/acs2/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java index 01d1111..dfdc397 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java @@ -16,7 +16,8 @@ public enum DriverTypeEnum { RGV_DEVICE_DRIVER(5, "rgv_station", "RGV", "rgv"), ELEVATOR_DRIVER(6, "standard_elevator", "电梯", "elevator"), CONVEYOR_CONTROL(7, "standard_conveyor_control", "标准版-输送线", "conveyor"), - CONVEYOR_COLOR(8, "lamp_three_color", "标准版-三色灯", "color"); + CONVEYOR_COLOR(8, "lamp_three_color", "标准版-三色灯", "color"), + CONVEYOR_AUTODOOR(9, "standard_autodoor", "标准版-自动门", "autodoor"); //驱动索引 private int index; //驱动编码 diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java b/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java index f99b017..879b801 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/ItemProtocol.java @@ -1,72 +1,58 @@ package org.nl.acs.device_driver.basedriver.standard_autodoor; -import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device_driver.standard_inspect.ItemDTO; +import org.nl.acs.device_driver.DeviceDriverBaseReader; 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"; +public enum ItemProtocol implements DeviceDriverBaseReader.KeyProvider { + OPEN("open", "打开到位", "DB600.B0"), + CLOSE("close", "关闭到位", "DB600.B1"), + TO_OPEN("toOpen", "下发打开", "DB601.W1"), + TO_CLOSE("toClose", "下发关闭", "DB601.W2"); + private final String key; + private final String description; + private final String address; - private StandardAutodoorDeviceDriver driver; - - public ItemProtocol(StandardAutodoorDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); + ItemProtocol(String key, String description, String address) { + this.key = key; + this.description = description; + this.address = address; } - public int getMode() { - return this.getOpcIntegerValue(item_mode); + @Override + public String getKey() { + return this.key; } - public int getAction() { - return this.getOpcIntegerValue(item_action); + public String getDescription() { + return description; } - 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) { - log.error("读取错误!"); - } else { - return value; - } - return 0; - + public String getAddress() { + return address; } public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDTO(item_heartbeat, "心跳", "DB51.B0")); - list.add(new ItemDTO(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true))); - list.add(new ItemDTO(item_action, "动作信号", "DB51.B2")); - list.add(new ItemDTO(item_error, "报警信号", "DB51.B4")); + List list = new ArrayList<>(); + for (ItemProtocol prop : values()) { + if (!prop.getKey().startsWith("to")) { + list.add(new ItemDTO(prop.getKey(), prop.getDescription(), prop.getAddress())); + } + } return list; } public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDTO(item_to_command, "作业命令", "DB52.W2", Boolean.valueOf(true))); + List list = new ArrayList<>(); + for (ItemProtocol prop : values()) { + if (prop.getKey().startsWith("to")) { + list.add(new ItemDTO(prop.getKey(), prop.getDescription(), prop.getAddress())); + } + } return list; } } - diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefinition.java b/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefinition.java index df0bc5d..ab8bddd 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefinition.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDefinition.java @@ -7,13 +7,9 @@ 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 StandardAutodoorDefinition implements OpcDeviceDriverDefinition { @Override @@ -34,7 +30,6 @@ public class StandardAutodoorDefinition implements OpcDeviceDriverDefinition { @Override public DeviceDriver getDriverInstance(Device device) { return (new StandardAutodoorDeviceDriver()).setDevice(device).setDriverDefinition(this); - } @Override @@ -51,21 +46,11 @@ public class StandardAutodoorDefinition implements OpcDeviceDriverDefinition { @Override public List getReadableItemDTOs() { - return getReadableItemDtos2(); - } - - public static List getReadableItemDtos2() { - List list = new ArrayList(); - list.add(new ItemDTO(ItemProtocol.item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDTO(ItemProtocol.item_mode, "工作模式", "DB600.B1", true)); - list.add(new ItemDTO(ItemProtocol.item_action, "动作信号", "DB600.B2")); - list.add(new ItemDTO(ItemProtocol.item_error, "报警信号", "DB600.B4")); - return list; + return ItemProtocol.getReadableItemDtos(); } @Override public List getWriteableItemDTOs() { return ItemProtocol.getWriteableItemDtos(); } - } diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java b/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java index 3f4af5a..d1f97e8 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -2,164 +2,122 @@ package org.nl.acs.device_driver.basedriver.standard_autodoor; import com.alibaba.fastjson.JSONObject; import lombok.Getter; -import lombok.Setter; import lombok.RequiredArgsConstructor; +import lombok.Setter; 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.DeviceDriverBaseReader; +import org.nl.acs.device_driver.RouteableDeviceDriver; +import org.nl.acs.device_driver.StandardRequestMethod; 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.monitor.DeviceStageMonitor; import org.nl.acs.opc.Device; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.task.service.TaskService; +import org.nl.modules.lucene.service.LuceneExecuteLogService; +import org.nl.modules.lucene.service.dto.LuceneLogDto; import org.nl.modules.wql.util.SpringContextHolder; -import org.openscada.opc.lib.da.Server; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -/** - * 自动门驱动 - */ @Slf4j @Getter @Setter @RequiredArgsConstructor -public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - - 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; +public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implements + DeviceDriver, + ExecutableDeviceDriver, + RouteableDeviceDriver, + DeviceStageMonitor, + StandardRequestMethod, + DeviceDriverBaseReader { + + private final LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); + + /** + * 读取 + */ + private int open; + private int close; + /** + * 下发命令 + */ + private int toOpen = 0; + private int toClose = 0; + /** + * 当前设备编号 + */ + private String currentDeviceCode; + + /** + * 消息 + */ + private String message; + + /** + * 请求标记 + */ + boolean requireSuccess = false; + + /** + * 请求时间 + */ + private long requireTime = System.currentTimeMillis(); + + /** + * 请求间隔时间 + */ + private long requireTimeOut = 3000L; + + /** + * 设备异常标记 + */ + private boolean isError = false; @Override public Device getDevice() { return this.device; } - @Override - public void execute() { - String message = null; - - String device_code = this.getDevice().getDevice_code(); - 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 & KeyProvider, T> T getOpcValue(E item, Class fieldClassType) { + return (T) this.getValue(item.getKey()); } - public synchronized String getStatus() { - JSONObject jo = new JSONObject(); - - if (action == 1) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "OPEN"); + @Override + public void setLog(String key, Object newValue, Object oldValue) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "自动线程读取信号:" + key + ",由" + oldValue + "->" + newValue)); + } - } else if (action == 2) { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "CLOSE"); + @Override + public void execute() { + this.currentDeviceCode = this.getDevice().getDevice_code(); + this.loadAssignData(currentDeviceCode, ItemProtocol.class); + } + @Override + public void executeLogic() { + if (!this.online) { + this.message = "设备离线"; } else { - jo.put("name", this.getDevice().getDevice_code()); - jo.put("status", "ERROR"); + this.isError = false; + this.message = ""; + //编写业务逻辑方法 } - 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 itemMap = new HashMap(); - itemMap.put(to_command, command); - ReadUtil.write(itemMap, server); - ReadUtil.write(itemMap, server); - server.disconnect(); - log.info("下发PLC信号：{},{}", to_command, command); - System.out.println("设备：" + devicecode + ",下发PLC信号：" + to_command + ",value：" + command); - + @Override + public JSONObject getDeviceStatusName() throws Exception { + JSONObject jo = new JSONObject(); + jo.put("device_code", this.currentDeviceCode); + jo.put("device_name", this.getDevice().getDevice_name()); + jo.put("driver_type", "standard_autodoor"); + jo.put("is_click", false); + jo.put("message", this.message); + jo.put("isOnline", this.online); + jo.put("isError", this.isError); + return jo; } - public synchronized void OpenOrClose(String type) { - - //开门 - if ("1".equals(type)) { - writeing(1); - } else { - writeing(2); - } + @Override + public void setDeviceStatus(JSONObject data) { } diff --git a/acs2/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java index f418784..371afae 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/modules/logicflow/service/impl/StageServiceImpl.java @@ -228,7 +228,7 @@ public class StageServiceImpl implements StageService { jo.put("message", standardCoveyorControlDeviceDriver.getMessage()); } else if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); - if (standardAutodoorDeviceDriver.getMode() == 0) { + /* if (standardAutodoorDeviceDriver.getMode() == 0) { mode = "未联机"; } else if (standardAutodoorDeviceDriver.getMode() == 1) { mode = "单机"; @@ -241,13 +241,13 @@ public class StageServiceImpl implements StageService { action = "开到位"; } else if (standardAutodoorDeviceDriver.getAction() == 2) { action = "关到位"; - } + }*/ obj.put("device_name", standardAutodoorDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("action", action); jo.put("isOnline", true); - jo.put("error", standardAutodoorDeviceDriver.getError()); - jo.put("isError", standardAutodoorDeviceDriver.getIserror()); +// jo.put("error", standardAutodoorDeviceDriver.getError()); +// jo.put("isError", standardAutodoorDeviceDriver.getIserror()); } //检测站点 else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { diff --git a/acs2/nladmin-ui/src/views/acs/device/config.vue b/acs2/nladmin-ui/src/views/acs/device/config.vue index 48a0365..09266f8 100644 --- a/acs2/nladmin-ui/src/views/acs/device/config.vue +++ b/acs2/nladmin-ui/src/views/acs/device/config.vue @@ -80,6 +80,7 @@ import standard_scanner from '@/views/acs/device/driver/standard_scanner' import standard_conveyor_control_with_scanner from '@/views/acs/device/driver/standard_conveyor_control_with_scanner' import standard_conveyor_control from '@/views/acs/device/driver/standard_conveyor_control' import lamp_three_color from '@/views/acs/device/driver/lamp_three_color' +import standard_autodoor from '@/views/acs/device/driver/standard_autodoor' import standard_conveyor_monitor from '@/views/acs/device/driver/standard_conveyor_monitor' import lnsh_mixing_mill from '@/views/acs/device/driver/lnsh/lnsh_mixing_mill' import lnsh_press from '@/views/acs/device/driver/lnsh/lnsh_press' @@ -123,6 +124,7 @@ export default { standard_conveyor_monitor, lnsh_mixing_mill, lnsh_press, + standard_autodoor, lnsh_palletizing_manipulator, lnsh_fold_disc_site, lnsh_kiln_lane, diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue b/acs2/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue new file mode 100644 index 0000000..31fb6e1 --- /dev/null +++ b/acs2/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue @@ -0,0 +1,389 @@ + + + + + +