diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/shangdianke/ItemProtocol.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/shangdianke/ItemProtocol.java deleted file mode 100644 index 21bac5b..0000000 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/shangdianke/ItemProtocol.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.nl.acs.device_driver.shangdianke; - -import lombok.Getter; -import lombok.Setter; - -/** - * @author zhangjiangwei - */ -@Getter -@Setter -public class ItemProtocol { - - - /** - * 心跳 - */ - public static final String ITEM_HEARTBEAT = "heartbeat"; - - /** - * 工作模式 - */ - public static final String ITEM_MODE = "mode"; - - /** - * 光电信号 - */ - public static final String ITEM_MOVE = "move"; - - /** - * 动作信号 - */ - public static final String ITEM_ACTION = "action"; - - /** - * 报警信号 - */ - public static final String ITEM_ERROR = "error"; - - /** - * 下发命令 - */ - public static final String ITEM_TO_COMMAND = "to_command"; - - boolean isOnline; - - private final PhotoelectricDetectionDeviceDriver driver; - - public ItemProtocol(PhotoelectricDetectionDeviceDriver driver) { - this.driver = driver; - } - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - this.isOnline = false; - return 0; - } else { - this.isOnline = true; - return value; - } - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(ItemProtocol.ITEM_HEARTBEAT); - } - public int getMode() { - return this.getOpcIntegerValue(ItemProtocol.ITEM_MODE); - } - public int getMove() { - return this.getOpcIntegerValue(ItemProtocol.ITEM_MOVE); - } - public int getAction() { - return this.getOpcIntegerValue(ItemProtocol.ITEM_ACTION); - } - public int getError() { - return this.getOpcIntegerValue(ItemProtocol.ITEM_ERROR); - } - public int getToCommand() { - return this.getOpcIntegerValue(ItemProtocol.ITEM_TO_COMMAND); - } -} diff --git a/acs/nladmin-ui/public/favicon.ico b/acs/nladmin-ui/public/favicon.ico index fcb6999..7675aa6 100644 Binary files a/acs/nladmin-ui/public/favicon.ico and b/acs/nladmin-ui/public/favicon.ico differ diff --git a/acs/nladmin-ui/src/assets/images/logo.png b/acs/nladmin-ui/src/assets/images/logo.png index f757710..7675aa6 100644 Binary files a/acs/nladmin-ui/src/assets/images/logo.png and b/acs/nladmin-ui/src/assets/images/logo.png differ diff --git a/acs/nladmin-ui/src/assets/logo/logo.png b/acs/nladmin-ui/src/assets/logo/logo.png index e263760..7675aa6 100644 Binary files a/acs/nladmin-ui/src/assets/logo/logo.png and b/acs/nladmin-ui/src/assets/logo/logo.png differ diff --git a/lms/nladmin-ui/public/favicon.ico b/lms/nladmin-ui/public/favicon.ico index fcb6999..7675aa6 100644 Binary files a/lms/nladmin-ui/public/favicon.ico and b/lms/nladmin-ui/public/favicon.ico differ diff --git a/lms/nladmin-ui/src/assets/images/logo.png b/lms/nladmin-ui/src/assets/images/logo.png index fbfa3c9..7675aa6 100644 Binary files a/lms/nladmin-ui/src/assets/images/logo.png and b/lms/nladmin-ui/src/assets/images/logo.png differ diff --git a/lms/nladmin-ui/src/assets/logo/logo.png b/lms/nladmin-ui/src/assets/logo/logo.png index e263760..7675aa6 100644 Binary files a/lms/nladmin-ui/src/assets/logo/logo.png and b/lms/nladmin-ui/src/assets/logo/logo.png differ diff --git a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index c331a60..bc2a53d 100644 --- a/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -14,7 +14,7 @@