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/CommonEnumUtil.java

@@ -722,20 +722,13 @@ public class CommonEnumUtil {
     }
 
     /**
-     * 客户端操作系统
-     *             return "Windows";
-     *             return "Mac";
-     *             return "Unix";
-     *             return "Android";
-     *             return "IPhone";
+     * 客户端登录标识
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOG_LOGIN_PLATFORM {
-        WINDOWS(1, "Windows", "Windows 操作系统"),
-        MAC(2, "Mac", "Mac 操作系统"),
-        UNIX(3, "Unix", "Linux 操作系统"),
-        ANDROID(4, "Android", "Android 操作系统"),
-        IPHONE(5, "IPhone", "IPhone 操作系统");
+        PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"),
+        PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"),
+        Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端");
 
         private int value;
         private String name;
@@ -762,11 +755,11 @@ public class CommonEnumUtil {
             return name;
         }
 
-        public static String valueOf(int val) {
-            String tmp = null;
+        public static LOG_LOGIN_PLATFORM valueOf(int val) {
+            LOG_LOGIN_PLATFORM tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].getName();
+                    tmp = values()[i];
                 }
             }
             return tmp;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java

@@ -9,6 +9,10 @@ package cn.estsh.i3plus.pojo.base.shirotoken;
  **/
 public class AdminToken extends BaseToken {
 
+    public AdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
+
     public AdminToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java

@@ -14,6 +14,7 @@ public class BaseToken implements AuthenticationToken {
     private String loginName;
     private String loginPwd;
     private String languageCode;
+    private Integer loginPlatform;
 
     public BaseToken(String loginName, String loginPwd, String languageCode) {
         this.loginName = loginName;
@@ -21,6 +22,13 @@ public class BaseToken implements AuthenticationToken {
         this.languageCode = languageCode;
     }
 
+    public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        this.loginName = loginName;
+        this.loginPwd = loginPwd;
+        this.languageCode = languageCode;
+        this.loginPlatform = loginPlatform;
+    }
+
     //身份
     @Override
     public Object getPrincipal() {
@@ -56,4 +64,12 @@ public class BaseToken implements AuthenticationToken {
     public void setLanguageCode(String languageCode) {
         this.languageCode = languageCode;
     }
+
+    public Integer getLoginPlatform() {
+        return loginPlatform;
+    }
+
+    public void setLoginPlatform(Integer loginPlatform) {
+        this.loginPlatform = loginPlatform;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java

@@ -12,4 +12,8 @@ public class SaAdminToken extends BaseToken {
     public SaAdminToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }
+
+    public SaAdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java

@@ -12,4 +12,8 @@ public class UserToken extends BaseToken {
     public UserToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }
+
+    public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
 }

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

@@ -16,8 +16,6 @@ import java.util.List;
 @Data
 public class SessionUser implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiParam("用户ID")
     private Long userId;
 

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

@@ -43,6 +43,14 @@ public class SysFile extends BaseBean {
     @ApiParam(value ="文件所属模块")
     private Integer fileSoftType;
 
+    public int getFileSoftTypeVal(){
+        if(fileSoftType == null){
+            return 0;
+        }
+
+        return fileSoftType.intValue();
+    }
+
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -83,5 +91,4 @@ public class SysFile extends BaseBean {
     @Column(name="DOWNLOAD_NUM")
     @ApiParam(value ="下载次数" , example ="0")
     private Integer downloadNum;
-
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -148,9 +149,9 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("交易类型")
     public Integer busiTypeCode;
 
-    @Column(name = "IS_SYNC")
+    @Column(name = "IS_SYNC", nullable = false)
     @ApiParam("是否同步")
-    public Integer isSync;
+    public Integer isSync = CommonEnumUtil.FALSE;
 
     @ApiParam(value = "待出库数量", example = "0")
     @Transient