From 834d40d55e301d0cf95873afd280e123c92ae8eb Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Sun, 28 Oct 2018 13:26:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E7=A1=AC=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/ImppEnumUtil.java    | 68 +++++++++++++++++++++-
 .../cn/estsh/i3plus/pojo/platform/bean/Tool.java   |  8 +--
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
index 7fd4de1..e1ae4d1 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
@@ -493,7 +493,6 @@ public class ImppEnumUtil {
         }
     }
 
-
     /**
      * 硬件连接方式
      * 1.SERIAL_PORT：通知
@@ -700,4 +699,71 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 通用状态
+     * 1.ENABLE：启用
+     * 2.DISABLE：禁用
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMM_STATUS{
+
+        ENABLE(1,"启用","fa fa-success cell-fa fa-check"),
+        DISABLE(2,"禁用","fa fa-disabled cell-fa fa-times-circle");
+
+        private int value;
+        private String name;
+        private String description;
+
+        COMM_STATUS() {
+        }
+
+        COMM_STATUS(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java
index 7f3e66c..120bc3b 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java
@@ -33,12 +33,12 @@ public class Tool extends BaseBean {
     @Column(name="NAME")
     @ApiParam(value ="名称" , access ="名称")
     private String name;
- 
+
     @Column(name="TOOL_TYPE_ID")
     @ApiParam(value ="类型ID" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long toolTypeId;
- 
+
     @Column(name="RED_TOOL_TYPE_NAME")
     @ApiParam(value ="类型名称" , access ="类型名称")
     private String redToolTypeName;
@@ -47,9 +47,9 @@ public class Tool extends BaseBean {
     @ApiParam(value ="设备状态（1.正常，2.禁用）" , example ="1" , access ="设备状态（1.正常，2.禁用）")
     private Integer toolStatus;
  
-    @Column(name="TOOL_HOST")
+    @Column(name="TOOL_IP")
     @ApiParam(value ="IP地址" , access ="IP地址")
-    private String toolHost;
+    private String toolIp;
  
     @Column(name="TOOL_PORT")
     @ApiParam(value ="端口" , example ="80" , access ="端口")