sweb通知公告

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java

@@ -269,8 +269,8 @@ public class SwebEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_TYPE {
 
-        MAIL(1, "邮件", "邮件"),
+//        MAIL(1, "邮件", "邮件"),
-        LETTER(2, "站内信", "站内信"),
+//        LETTER(2, "站内信", "站内信"),
         SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
         SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
 
@@ -410,15 +410,15 @@ public class SwebEnumUtil {
         SWEB_FE("SWEB_FE", "SWEB_FE", "sweb系统");
 
         private String value;
-        private String name;
+        private String code;
         private String description;
 
         FE_PLATFORM() {
         }
 
-        FE_PLATFORM(String value, String name, String description) {
+        FE_PLATFORM(String value, String code, String description) {
             this.value = value;
-            this.name = name;
+            this.code = code;
             this.description = description;
         }
 
@@ -426,8 +426,8 @@ public class SwebEnumUtil {
             return value;
         }
 
-        public String getName() {
+        public String getCode() {
-            return name;
+            return code;
         }
 
         public String getDescription() {
@@ -438,7 +438,7 @@ public class SwebEnumUtil {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].name;
+                    tmp = values()[i].code;
                 }
             }
             return tmp;
@@ -457,7 +457,74 @@ public class SwebEnumUtil {
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].name.equals(code)) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 用户消息状态
+     * 1.READ：已读
+     * 2.UNREAD：未读
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_STATUS {
+
+        READ(1,"已读","fa cell-fa fa-file-text"),
+        UNREAD(2,"未读","fa cell-fa fa-file-o");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MESSAGE_STATUS() {
+        }
+
+        MESSAGE_STATUS(int value, String description, String code) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].code;
+                }
+            }
+            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].code.equals(code)) {
                     tmp = values()[i].description;
                 }
             }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasVendor.java

@@ -63,4 +63,12 @@ public class BasVendor extends BaseBean{
     @Column(name = "PASSWORD")
     @ApiParam(value = "密码")
     private String password;
+
+    public BasVendor() {
+    }
+
+    public BasVendor(Long id,String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
 }