Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -259,4 +259,209 @@ public class SwebEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 用户消息类型
+     * 1.NOTICE：通知
+     * 2.STATION_LETTER：站内信
+     * 3.SWEB_NOTICE：SWEB通知
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_TYPE {
+
+        MAIL(1, "邮件", "邮件"),
+        LETTER(2, "站内信", "站内信"),
+        SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
+        SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
+
+        private int value;
+        private String name;
+        private String description;
+
+        MESSAGE_TYPE() {
+        }
+
+        MESSAGE_TYPE(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;
+        }
+    }
+
+    /**
+     * 附件来源
+     * 1.NOTICE：通知
+     * 2.STATION_LETTER：站内信
+     * 3.SWEB_NOTICE：SWEB通知
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FILE_ATTACH_SOURCE {
+        MAIL(1, "邮件", "邮件"),
+        LETTER(2, "站内信", "站内信"),
+        SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
+        SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
+
+        private int value;
+        private String name;
+        private String description;
+
+        FILE_ATTACH_SOURCE() {
+        }
+
+        FILE_ATTACH_SOURCE(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;
+        }
+    }
+
+    /**
+     * 前端系统平台
+     * IMPP_FE：impp系统
+     * SWEB_FE：sweb系统
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FE_PLATFORM {
+        IMPP_FE("IMPP_FE", "IMPP_FE", "impp系统"),
+        SWEB_FE("SWEB_FE", "SWEB_FE", "sweb系统");
+
+        private String value;
+        private String name;
+        private String description;
+
+        FE_PLATFORM() {
+        }
+
+        FE_PLATFORM(String value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(String 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(String 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;
+        }
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -100,6 +100,14 @@ public class SysMessage extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long readCount;
 
+    public long getReadCountVal(){
+        if(readCount == null){
+            return 0;
+        } else {
+            return readCount.longValue();
+        }
+    }
+
     public SysMessage() {
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java

@@ -1,27 +0,0 @@
-package cn.estsh.i3plus.pojo.platform.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-
-/**
- * @Description : 测试类
- * @Reference :
- * @Author : yunhao
- * @CreateDate : 2019-02-24 16:21
- * @Modify:
- **/
-public class TestInfo extends BaseBean {
-
-
-    /**
-     * 执行耗时
-     */
-    private long executeTime;
-
-    public TestInfo(){
-
-    }
-
-    public TestInfo(long executeTime){
-        this.executeTime = System.currentTimeMillis() - executeTime;
-    }
-}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java

@@ -31,4 +31,9 @@ public class SwebLoginUserModel implements Serializable {
 
     @ApiParam(value = "ip地址")
     private String ip;
+
+    public SwebLoginUserModel(Long id, String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -375,16 +375,16 @@ public class WmsHqlPack {
      * @param wareHouse
      * @return
      */
-    public static String packHqlWareHouseUnique(WareHouse wareHouse) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWareHouseUnique(WareHouse wareHouse) {
+        DdlPackBean result = new DdlPackBean();
 
-        HqlPack.getStringEqualPack(wareHouse.getName(), "name", result);
-        HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result);
-        HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result);
+        DdlPreparedPack.getStringEqualPack(wareHouse.getName(), "name", result);
+        DdlPreparedPack.getStringEqualPack(wareHouse.getCode(), "code", result);
+        DdlPreparedPack.getNumNOEqualPack(wareHouse.getId(), "id", result);
 
         getStringBuilderPack(wareHouse, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -874,19 +874,19 @@ public class WmsHqlPack {
      * @param wmsStockQuan
      * @return
      */
-    public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) {
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
-        HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
-        HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
-        HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
-        HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);
 
         getStringBuilderPack(wmsStockQuan, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -969,15 +969,15 @@ public class WmsHqlPack {
      * @param wmsMoveMaster
      * @return
      */
-    public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) {
+        DdlPackBean result = new DdlPackBean();
 
-        HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
-        HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
         getStringBuilderPack(wmsMoveMaster, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -988,7 +988,6 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) {
         DdlPackBean packBean = new DdlPackBean();
-//        StringBuffer result = new StringBuffer();
         DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", packBean);