Merge remote-tracking branch 'remotes/origin/test'

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/CommonTreeModel.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.platform;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 /**
@@ -13,7 +14,9 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class CommonTreeModel {
+public class CommonTreeModel implements Serializable {
+
+    private static final long serialVersionUID = -3612131411549787983L;
 
     private BaseBean bean;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateModel.java

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate;
 import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -14,7 +15,9 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class LabelTemplateModel {
+public class LabelTemplateModel implements Serializable {
+
+    private static final long serialVersionUID = 2488615810903387414L;
 
     private SysLabelTemplate labelTemplate;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * @Reference :
@@ -12,8 +14,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class MessagePagerModel {
+public class MessagePagerModel implements Serializable {
 
+    private static final long serialVersionUID = 6236940647561791913L;
     private SysMessage sysMessage;
 
     private Pager pager;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * @Reference :
@@ -12,8 +14,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class RefUserMessagePagerModel {
+public class RefUserMessagePagerModel implements Serializable {
 
+    private static final long serialVersionUID = -4109915131051843577L;
     private SysRefUserMessage sysRefUserMessage;
 
     private Pager pager;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java

@@ -22,6 +22,8 @@ import java.util.List;
 @Data
 public class UserDetailModel extends BaseBean {
 
+
+    private static final long serialVersionUID = 4413526491980249893L;
     @ApiParam(value ="账号ID")
     private String userId;
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailPagerModel.java

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.platform;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * @Reference :
@@ -11,8 +13,10 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class UserDetailPagerModel {
+public class UserDetailPagerModel implements Serializable {
+
 
+    private static final long serialVersionUID = -5347423781211585908L;
     private UserDetailModel userDetailModel;
 
     private Pager pager;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserRolePagerModel.java

@@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description :
  * @Reference :
@@ -12,8 +14,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class UserRolePagerModel {
+public class UserRolePagerModel implements Serializable {
 
+    private static final long serialVersionUID = 6180855492105859082L;
     private SysRole sysRole;
 
     private Pager pager;

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.platform.bean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @Description : 邮件配置信息
  * @Reference :
@@ -11,8 +13,9 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class MailConfig {
+public class MailConfig implements Serializable {
 
+    private static final long serialVersionUID = -6776607385471325344L;
     @ApiParam(value = "邮箱开关")
     private int mailSwitch;
 

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

@@ -16,6 +16,11 @@ import java.util.List;
 @Data
 public class SessionUser implements Serializable {
 
+    private static final long serialVersionUID = -6478598185766500419L;
+
+    @ApiParam("会话ID")
+    private String token;
+
     @ApiParam("用户ID")
     private Long userId;
 
@@ -32,6 +37,9 @@ public class SessionUser implements Serializable {
     @ApiParam("用户类型")
     private String userType;
 
+    @ApiParam("用户登录平台")
+    private Integer loginPlatform;
+
     @ApiParam("用户信息")
     private SysUser user;
 

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value="条码规则",description = "条码规则")
 public class SysBarcodeRule extends BaseBean {
 
+    private static final long serialVersionUID = -2041412527908996307L;
     @Column(name = "NAME")
     @ApiParam(value = "规则名称")
     private String name;

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value="系统配置",description = "系统配置")
 public class SysConfig extends BaseBean {
 
+    private static final long serialVersionUID = 2718495807943432629L;
     @Column(name="NAME")
     @ApiParam(value ="名称")
     private String name;

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

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="部门",description = "部门")
 public class SysDepartment extends BaseBean {
 
+    private static final long serialVersionUID = -1505054622781210062L;
     @Column(name="NAME")
     @ApiParam(value ="名称")
     private String name;

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

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api(value="系统字典",description = "系统字典")
 public class SysDictionary extends BaseBean {
 
+    private static final long serialVersionUID = 593801368328634592L;
     @Column(name="NAME")
     @ApiParam(value ="字典名称")
     private String name;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="企业信息",description = "企业信息")
 public class SysEnterprise extends BaseBean {
 
+    private static final long serialVersionUID = -2138074947458189045L;
     @Column(name="NAME")
     @ApiParam(value ="名称" , access ="名称")
     private String name;

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

@@ -31,6 +31,7 @@ import java.text.DecimalFormat;
 @Api(value="企业配置信息",description = "企业配置信息")
 public class SysEnterpriseConfig extends BaseBean {
 
+    private static final long serialVersionUID = -6131429295344210675L;
     @Column(name="ENTERPRISE_ID")
     @ApiParam(value ="企业id" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api("工厂仓库")
 public class SysFactoryStore extends BaseBean {
 
+    private static final long serialVersionUID = 6717712070974796221L;
     @Column(name="store_code")
     @ApiParam("仓库代码")
     private String storeCode;

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

@@ -31,6 +31,7 @@ import java.text.DecimalFormat;
 @Api(value="文件",description = "文件")
 public class SysFile extends BaseBean {
 
+    private static final long serialVersionUID = 623700632055475696L;
     @Column(name="NAME")
     @ApiParam(value ="文件名称")
     private String name;

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="文件附件",description = "文件附件")
 public class SysFileAttach extends BaseBean {
 
+    private static final long serialVersionUID = -6730529794381568890L;
     @Column(name="ATTACH_SOFT_TYPE")
     @ApiParam(value ="附件所属模块")
     private Integer attachSoftType;

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

@@ -27,6 +27,7 @@ import javax.persistence.*;
 @Api(value="打印模板",description = "打印模板")
 public class SysLabelTemplate extends BaseBean {
 
+    private static final long serialVersionUID = 5371856566557305323L;
     @Column(name="TEMPLATE_CODE")
     @ApiParam(value ="模板代码")
     private String templateCode;

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

@@ -29,6 +29,7 @@ import javax.persistence.*;
 @Api(value="打印模板参数",description = "打印模板参数")
 public class SysLabelTemplateParam extends BaseBean {
 
+    private static final long serialVersionUID = 6476163540527157643L;
     @Column(name="TEMPLATE_ID")
     @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Api(value="系统语言表",description = "对系统语言进行匹配。")
 public class SysLocaleLanguage extends BaseBean {
 
+    private static final long serialVersionUID = -1904007575555304772L;
     @Column(name="LANGUAGE_NAME")
     @ApiParam(value = "语言名称",example = "前台显示的名称")
     private String languageName;

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

@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api(value="系统资源",description = "对按钮、功能、信息提示等进行转换。")
 public class SysLocaleResource  extends BaseBean {
 
+    private static final long serialVersionUID = -2397207310100672746L;
     @Column(name="resource_type")
     @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE")
     private Integer resourceType;

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

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api(value="用户登录记录",description = "用户登录记录")
 public class SysLogUserLogin extends BaseBean {
 
+    private static final long serialVersionUID = 4665598896654312569L;
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , access ="用户ID")
     private Long userId;

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

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="系统功能",description = "系统功能")
 public class SysMenu extends BaseBean {
 
+    private static final long serialVersionUID = 6892387964234712323L;
     @Column(name="NAME")
     @ApiParam(value ="功能名称")
     private String name;

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

@@ -31,6 +31,7 @@ import java.util.List;
 @Api(value = "系统消息", description = "系统消息")
 public class SysMessage extends BaseBean {
 
+    private static final long serialVersionUID = -6090909263221993356L;
     @Column(name = "MESSAGE_TITLE")
     @ApiParam(value = "消息标题", access = "消息标题")
     private String messageTitle;

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

@@ -33,6 +33,7 @@ import javax.persistence.Table;
 @Api(value="单号规则",description = "单号规则")
 public class SysOrderNoRule extends BaseBean {
 
+    private static final long serialVersionUID = -283233170141936426L;
     @Column(name = "NAME")
     @ApiParam(value = "规则名称")
     private String name;

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

@@ -33,6 +33,7 @@ import java.util.List;
 @Api(value="组织",description = "组织")
 public class SysOrganize extends BaseBean {
 
+    private static final long serialVersionUID = 5932340027033720434L;
     @Column(name="NAME")
     @ApiParam(value ="名称")
     private String name;

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

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="岗位",description = "岗位")
 public class SysPosition extends BaseBean {
 
+    private static final long serialVersionUID = -3438901661332705721L;
     @Column(name="NAME")
     @ApiParam(value ="名称" , access ="名称")
     private String name;

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

@@ -31,6 +31,7 @@ import java.text.DecimalFormat;
 @Api(value="关系-角色菜单",description = "关系-角色菜单")
 public class SysRefRoleMenu extends BaseBean {
 
+    private static final long serialVersionUID = -2013469818246101184L;
     @Column(name="MENU_ID")
     @ApiParam(value ="菜单ID" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="关系-任务周期与计划",description = "关系-任务周期与计划")
 public class SysRefTaskCyclePlan extends BaseBean {
 
+    private static final long serialVersionUID = 5217923903994138624L;
     @Column(name="TASK_CYCLE_ID")
     @ApiParam(value ="任务周期id" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -31,6 +31,7 @@ import java.text.DecimalFormat;
 @Api(value="关系-账号部门",description = "关系-账号部门")
 public class SysRefUserDepartment extends BaseBean {
 
+    private static final long serialVersionUID = -2361062982274833764L;
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="关系-用户部门",description = "关系-用户部门")
 public class SysRefUserInfoDepartment extends BaseBean {
 
+    private static final long serialVersionUID = -1023456569329939973L;
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -31,6 +31,7 @@ import javax.persistence.Table;
 @Api(value="关系-用户消息",description = "关系-用户消息")
 public class SysRefUserMessage extends BaseBean {
 
+    private static final long serialVersionUID = 555705651072659162L;
     @Column(name="MESSAGE_ID")
     @ApiParam(value ="消息id" ,example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api(value="关系-用户岗位",description = "关系-用户岗位")
 public class SysRefUserPosition extends BaseBean {
 
+    private static final long serialVersionUID = 3234085587521697199L;
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -30,7 +30,7 @@ import javax.persistence.Table;
 @Api(value="关系-用户角色",description = "关系-用户角色")
 public class SysRefUserRole extends BaseBean {
 
-
+    private static final long serialVersionUID = -2253689528880200360L;
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api(value="用户角色表",description = "用户权限角色。")
 public class SysRole extends BaseBean {
 
+    private static final long serialVersionUID = -869130572226447415L;
     @Column(name="NAME")
     @ApiParam(value ="角色名称")
     private String name;

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value="任务",description = "任务")
 public class SysTask extends BaseBean {
 
+    private static final long serialVersionUID = -4462661508105857312L;
     @Column(name="NAME")
     @ApiParam(value ="名称")
     private String name;

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

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api(value="任务周期",description = "任务周期")
 public class SysTaskCycle extends BaseBean {
 
+    private static final long serialVersionUID = 6821425488105955756L;
     @Column(name="NAME")
     @ApiParam(value ="名称")
     private String name;

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

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @Api(value = "任务计划", description = "任务计划")
 public class SysTaskPlan extends BaseBean {
 
+    private static final long serialVersionUID = -136675837627794707L;
     @Column(name = "NAME")
     @ApiParam(value = "名称")
     private String name;

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

@@ -37,6 +37,7 @@ import javax.persistence.Table;
 @Api(value="硬件设备表",description = "硬件设备表")
 public class SysTool extends BaseBean {
 
+    private static final long serialVersionUID = 100098534186501411L;
     @Column(name="NAME")
     @ApiParam(value ="名称" , access ="名称")
     private String name;

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

@@ -29,6 +29,7 @@ import java.text.DecimalFormat;
 @Api(value="设备类型",description = "设备类型")
 public class SysToolType extends BaseBean {
 
+    private static final long serialVersionUID = 6736217130492256001L;
     @Column(name="NAME")
     @ApiParam(value ="名称" , access ="名称")
     private String name;

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

@@ -32,6 +32,7 @@ import java.util.List;
 @Api(value="账号登陆表",description = "账号登陆系统账户。")
 public class SysUser extends BaseBean {
 
+    private static final long serialVersionUID = 3721769401146979123L;
     @Column(name="USER_INFO_ID")
     @ApiParam(value ="人员ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -34,6 +34,8 @@ import java.util.List;
 @Api(value="用户详细",description = "用户详细")
 public class  SysUserInfo extends BaseBean {
 
+    private static final long serialVersionUID = 3876318482048754222L;
+
     @Column(name="USER_ID")
     @ApiParam(value ="账号ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -32,6 +32,7 @@ import javax.persistence.Version;
 @Api(value="测试用户类",description = "测试事务信息")
 public class TestTransUser extends BaseBean {
 
+    private static final long serialVersionUID = 3860279685301736213L;
     @Column(name="NAME")
     @ApiParam(value ="名称" , access ="名称")
     private String name;