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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -91,7 +91,7 @@ public abstract class BaseBean implements Serializable {
     @ApiParam(value = "排序属性")
     public transient String orderByParam;
 
-    @ApiParam(value = "排序属性")
+    @ApiParam(value = "排序属性",example = "1")
     //CommonEnumUtil.ASC_OR_DESC  1 asc,2 desc
     public transient int ascOrDesc;
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -10,22 +10,22 @@ import io.swagger.annotations.ApiParam;
  * @Modify:
  **/
 public class Pager {
-    @ApiParam("总行数")
+    @ApiParam(value = "总行数",example = "0")
     private int totalRows;
 
-    @ApiParam("每页显示")
+    @ApiParam(value = "每页显示",example = "0")
     private int pageSize;
 
-    @ApiParam("当前页")
+    @ApiParam(value = "当前页",example = "0")
     private int currentPage;
 
-    @ApiParam("总页数")
+    @ApiParam(value = "总页数",example = "0")
     private int totalPages;
 
-    @ApiParam("起始行")
+    @ApiParam(value = "起始行",example = "0")
     private int startRow;
 
-    @ApiParam("结束行")
+    @ApiParam(value = "结束行",example = "0")
     private int endRow;
 
     @ApiParam("翻页操作")

modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,34 +0,0 @@
-cn\estsh\i3plus\pojo\base\jpa\JpaConfig.class
-cn\estsh\i3plus\pojo\base\tool\SnowflakeIdMaker.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil.class
-cn\estsh\i3plus\pojo\base\bean\BaseModelBean.class
-cn\estsh\i3plus\pojo\base\bean\ListPager.class
-cn\estsh\i3plus\pojo\base\enumutil\WmsEnumUtil.class
-cn\estsh\i3plus\pojo\base\enumutil\ResourceEnumUtil$MESSAGE.class
-cn\estsh\i3plus\pojo\base\enumutil\ImppEnumUtil.class
-cn\estsh\i3plus\pojo\base\enumutil\ImppEnumUtil$ORGANIZE_YTPE.class
-cn\estsh\i3plus\pojo\base\tool\SqlPack.class
-cn\estsh\i3plus\pojo\base\jpa\factory\BaseRepositoryFactoryBean$BaseRepositoryFactory.class
-cn\estsh\i3plus\pojo\base\enumutil\MesEnumUtil.class
-cn\estsh\i3plus\pojo\base\bean\BaseBean.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$TRUE_OR_FALSE.class
-cn\estsh\i3plus\pojo\base\shirotoken\SaAdminToken.class
-cn\estsh\i3plus\pojo\base\tool\HqlPack.class
-cn\estsh\i3plus\pojo\base\common\Pager.class
-cn\estsh\i3plus\pojo\base\jpa\factory\BaseRepositoryFactoryBean.class
-cn\estsh\i3plus\pojo\base\enumutil\ResourceEnumUtil.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$SYS_LOCALE_RESOURCE_TYPE.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$STATUS.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$METHOD_LEVEL.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$IS_VAILD.class
-cn\estsh\i3plus\pojo\base\shirotoken\UserToken.class
-cn\estsh\i3plus\pojo\base\common\PagerHelper.class
-cn\estsh\i3plus\pojo\base\enumutil\ResourceEnumUtil$EXCEPTION.class
-cn\estsh\i3plus\pojo\base\shirotoken\BaseToken.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$IS_DEAL.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$SOFT_TYPE.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$USER_TYPE.class
-cn\estsh\i3plus\pojo\base\shirotoken\AdminToken.class
-cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil$ASC_OR_DESC.class
-cn\estsh\i3plus\pojo\base\jpa\daoimpl\BaseRepositoryImpl.class
-cn\estsh\i3plus\pojo\base\jpa\dao\BaseRepository.class

modules/i3plus-pojo-base/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,21 +0,0 @@
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\common\Pager.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\common\PagerHelper.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\ImppEnumUtil.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\tool\SnowflakeIdMaker.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\bean\ListPager.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\shirotoken\SaAdminToken.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\tool\HqlPack.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\shirotoken\BaseToken.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\bean\BaseModelBean.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\jpa\daoimpl\BaseRepositoryImpl.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\jpa\factory\BaseRepositoryFactoryBean.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\WmsEnumUtil.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\CommonEnumUtil.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\jpa\dao\BaseRepository.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\MesEnumUtil.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\shirotoken\AdminToken.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\enumutil\ResourceEnumUtil.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\jpa\JpaConfig.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\bean\BaseBean.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\tool\SqlPack.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-base\src\main\java\cn\estsh\i3plus\pojo\base\shirotoken\UserToken.java

modules/i3plus-pojo-factory/target/maven-archiver/pom.properties

@@ -1,4 +0,0 @@
-#Created by Apache Maven 3.5.4
-version=1.0-SNAPSHOT
-groupId=i3plus.pojo
-artifactId=i3plus-pojo-factory

modules/i3plus-pojo-factory/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +0,0 @@
-F:\works\IntelliJ IDEA 2018.2.3\i3-IMPP\i3plus-pojo\modules\i3plus-pojo-factory\src\main\java\cn\estsh\i3plus\pojo\factory\bean\MachineFactory.java

modules/i3plus-pojo-mes/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,2 +0,0 @@
-cn\estsh\i3plus\pojo\mes\MachineFactory.class
-cn\estsh\i3plus\pojo\mes\WorkPlan.class

modules/i3plus-pojo-mes/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,2 +0,0 @@
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-mes\src\main\java\cn\estsh\i3plus\pojo\mes\MachineFactory.java
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-mes\src\main\java\cn\estsh\i3plus\pojo\mes\WorkPlan.java

modules/i3plus-pojo-model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1 +0,0 @@
-cn\estsh\i3plus\pojo\model\hardware\EsbXmlMessage.class

modules/i3plus-pojo-model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1 +0,0 @@
-D:\Idea-Platform\i3PlusPlatform\i3plus-pojo\modules\i3plus-pojo-model\src\main\java\cn\estsh\i3plus\pojo\model\hardware\EsbXmlMessage.java

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -10,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.text.DecimalFormat;
 import java.util.List;
 
 /**
@@ -29,9 +30,9 @@ import java.util.List;
 public class Department extends BaseBean {
 
  
-    @Column(name="NAME")
+    @Column(name="DEPARTMENT_NAME")
     @ApiParam(value ="名称")
-    private String name;
+    private String departmentName;
  
     @Column(name="DEPARTMENT_CODE")
     @ApiParam(value ="部门代码")
@@ -42,23 +43,21 @@ public class Department extends BaseBean {
     private String redParentName;
  
     @Column(name="PARENT_ID")
-    @ApiParam(value ="父节点ID")
+    @ApiParam(value ="父节点ID" , example = "0")
-    private String parentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
 
     @ApiParam(value ="子部门列表")
     private transient List<Department> childList;
  
-    @Column(name="DEPARTMENT_STATUS")
-    @ApiParam(value ="部门状态（1.正常，2.禁用）" , example ="1" , access ="部门状态（1.正常，2.禁用）")
-    private Integer departmentStatus;
- 
     @Column(name="RED_ORGANIZATION_NAME")
     @ApiParam(value ="所属组织名称" , access ="所属组织名称")
-    private String redOrganizationName;
+    private String redOrganizeName;
  
-    @Column(name="ORGANIZATION_ID")
+    @Column(name="ORGANIZE_ID")
-    @ApiParam(value ="所属组织" , access ="所属组织")
+    @ApiParam(value ="所属组织" , example = "0")
-    private String organizationId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizeId;
  
     @Column(name="DEPARTMENT_SORT")
     @ApiParam(value ="排序" , example ="1" , access ="排序")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,12 +31,13 @@ public class EnterpriseConfig extends BaseBean {
 
  
     @Column(name="ENTERPRISE_ID")
-    @ApiParam(value ="企业id" , access ="企业id")
+    @ApiParam(value ="企业id" , example = "0")
-    private String enterpriseId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long enterpriseId;
  
-    @Column(name="NAME")
+    @Column(name="ENTERPRISE_CONFIG_NAME")
     @ApiParam(value ="配置名称" , access ="配置名称")
-    private String name;
+    private String enterpriseConfigName;
  
     @Column(name="CONFIG_TYPE_ID")
     @ApiParam(value ="配置类型" , example ="0" , access ="配置类型")
@@ -42,7 +45,7 @@ public class EnterpriseConfig extends BaseBean {
  
     @Column(name="CONFIG_PARENT_ID")
     @ApiParam(value ="配置父节点" , access ="配置父节点")
-    private String configParentId;
+    private Long configParentId;
  
     @Column(name="CONFIG_KEY")
     @ApiParam(value ="配置代码" , access ="配置代码")

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

@@ -30,7 +30,7 @@ public class LogUserLogin extends BaseBean {
  
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , access ="用户ID")
-    private String userId;
+    private Long userId;
  
     @Column(name="LOG_LOGIN_NAME")
     @ApiParam(value ="登录名称" , access ="登录名称")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,36 +34,33 @@ public class Organize extends BaseBean {
     @ApiParam(value ="名称" , access ="名称")
     private String name;
  
-    @Column(name="ORGANIZATION_CODE")
+    @Column(name="ORGANIZE_CODE")
     @ApiParam(value ="组织代码" , access ="组织代码")
-    private String organizationCode;
+    private String organizeCode;
  
-    @Column(name="ORGANIZATION_TYPE_ID")
+    @Column(name="ORGANIZE_TYPE_ID")
     @ApiParam(value ="组织类型ID（1.集团，2.公司，3.工厂）" , example ="1" , access ="组织类型ID（1.集团，2.公司，3.工厂）")
-    private Integer organizationTypeId;
+    private Integer organizeTypeId;
- 
-    @Column(name="ORGANIZATION_TYPE_NAME")
-    @ApiParam(value ="组织类型名称" , access ="组织类型名称")
-    private String organizationTypeName;
  
     @Column(name="PARENT_ID")
-    @ApiParam(value ="父节点" , access ="父节点")
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "0")
-    private String parentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
  
     @Column(name="RED_PARENT_NAME")
     @ApiParam(value ="父节点" , access ="父节点")
     private String redParentName;
  
-    @Column(name="ORGANIZATION_DESCRIPTION")
+    @Column(name="ORGANIZE_DESCRIPTION")
     @ApiParam(value ="组织描述" , access ="组织描述")
-    private String organizationDescription;
+    private String organizeDescription;
  
-    @Column(name="ORGANIZATION_SORT")
+    @Column(name="ORGANIZE_SORT")
     @ApiParam(value ="排序" , example ="1" , access ="排序")
-    private Integer organizationSort;
+    private Integer organizeSort;
  
-    @Column(name="ORGANIZATION_STATUS")
+    @Column(name="ORGANIZE_STATUS")
     @ApiParam(value ="组织状态（1.正常，2.禁用）" , example ="1" , access ="组织状态（1.正常，2.禁用）")
-    private Integer organizationStatus;
+    private Integer organizeStatus;
 
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -10,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.text.DecimalFormat;
 
 /**
  * @Description : 岗位
@@ -28,26 +29,23 @@ import java.text.DecimalFormat;
 public class Position extends BaseBean {
 
  
-    @Column(name="NAME")
+    @Column(name="POSITION_NAME")
     @ApiParam(value ="名称" , access ="名称")
-    private String name;
+    private String positionName;
  
     @Column(name="POSITION_CODE")
     @ApiParam(value ="岗位代码" , access ="岗位代码")
     private String positionCode;
  
     @Column(name="PARENT_ID")
-    @ApiParam(value ="上级岗位" , access ="上级岗位")
+    @ApiParam(value ="上级岗位" , example ="0" , access ="上级岗位")
-    private String parentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
  
     @Column(name="RED_PARENT_NAME")
     @ApiParam(value ="上级岗位名称" , access ="上级岗位名称")
     private String redParentName;
  
-    @Column(name="POSITION_STATUS")
-    @ApiParam(value ="状态（1.正常，2.禁用）" , example ="1" , access ="状态（1.正常，2.禁用）")
-    private Integer positionStatus;
- 
     @Column(name="POSITION_DESCRIPTION")
     @ApiParam(value ="描述" , access ="描述")
     private String positionDescription;

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,16 +31,18 @@ public class RefRoleMenu extends BaseBean {
 
  
     @Column(name="MENU_ID")
-    @ApiParam(value ="菜单ID" , access ="菜单ID")
+    @ApiParam(value ="菜单ID" ,example = "0")
-    private String menuId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long menuId;
  
     @Column(name="RED_MENU_NAME")
     @ApiParam(value ="菜单名称" , access ="菜单名称")
     private String redMenuName;
  
     @Column(name="ROLE_ID")
-    @ApiParam(value ="角色ID" , access ="角色ID")
+    @ApiParam(value ="角色ID" , example = "0")
-    private String roleId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long roleId;
  
     @Column(name="RED_ROLE_NAME")
     @ApiParam(value ="角色名称" , access ="角色名称")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,12 +31,14 @@ public class RefUserDepartment extends BaseBean {
 
  
     @Column(name="USER_ID")
-    @ApiParam(value ="用户ID" , access ="用户ID")
+    @ApiParam(value ="用户ID" , example = "0")
-    private String userId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
  
     @Column(name="DEPARTMENT_ID")
-    @ApiParam(value ="部门ID" , access ="部门ID")
+    @ApiParam(value ="部门ID" , example = "0")
-    private String departmentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long departmentId;
  
     @Column(name="RED_DEPARTMENT_NAME")
     @ApiParam(value ="部门名称" , access ="部门名称")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -27,18 +29,15 @@ import java.text.DecimalFormat;
 @Api(value="关系-用户岗位",description = "关系-用户岗位")
 public class RefUserPosition extends BaseBean {
 
- 
-    @Column(name="ORGANIZE_ID")
-    @ApiParam(value ="组织ID" , access ="组织ID")
-    private String organizeId;
- 
     @Column(name="USER_ID")
-    @ApiParam(value ="用户ID" , access ="用户ID")
+    @ApiParam(value ="用户ID" , example = "0")
-    private String userId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
  
     @Column(name="POSITION_ID")
-    @ApiParam(value ="岗位ID" , access ="岗位ID")
+    @ApiParam(value ="岗位ID" , example = "0")
-    private String positionId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long positionId;
  
     @Column(name="RED_POSITION_NAME")
     @ApiParam(value ="岗位名称" , access ="岗位名称")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,15 +31,17 @@ public class RefUserRole extends BaseBean {
 
  
     @Column(name="USER_ID")
-    @ApiParam(value ="用户ID" , access ="用户ID")
+    @ApiParam(value ="用户ID" , example = "0")
-    private String userId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
  
     @Column(name="ROLE_ID")
-    @ApiParam(value ="角色ID" , access ="角色ID")
+    @ApiParam(value ="角色ID" , example = "0")
-    private String roleId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long roleId;
  
-    @Column(name="RED_ROLE_ID")
+    @Column(name="RED_ROLE_NAME")
     @ApiParam(value ="角色名称" , access ="角色名称")
-    private String redRoleId;
+    private String redRoleName;
 
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,13 +34,14 @@ public class SysDictionary extends BaseBean {
     @ApiParam(value ="名称" , access ="名称")
     private String name;
  
-    @Column(name="DICTIONART_CODE")
+    @Column(name="DICTIONARY_CODE")
     @ApiParam(value ="字典代码" , access ="字典代码")
-    private String dictionartCode;
+    private String dictionaryCode;
  
     @Column(name="PARENT_ID")
-    @ApiParam(value ="父节点" , access ="父节点")
+    @ApiParam(value ="父节点" , example = "0")
-    private String parentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
  
     @Column(name="RED_PARENT_NAME")
     @ApiParam(value ="父级节点名称" , access ="父级节点名称")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,8 +35,9 @@ public class SysFile extends BaseBean {
     private String name;
  
     @Column(name="USER_ID")
-    @ApiParam(value ="用户ID" , access ="用户ID")
+    @ApiParam(value ="用户ID" , example = "0")
-    private String userId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
  
     @Column(name="FILE_PATH")
     @ApiParam(value ="文件路径" , access ="文件路径")

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

@@ -16,9 +16,9 @@ import javax.persistence.Table;
  * @CreateDate : 2018-10-11 11:02
  * @Modify:
  **/
+@Data
 @Entity
 @Table(name="sys_locale_language")
-@Data
 @Api(value="系统语言表",description = "对系统语言进行匹配。")
 public class SysLocaleLanguage extends BaseBean {
 

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -36,13 +38,10 @@ public class SysMenu extends BaseBean {
     @ApiParam(value ="功能类型（1.模块，2.菜单，3.按钮）" , example ="1" , access ="功能类型（1.模块，2.菜单，3.按钮）")
     private Integer menuTypeId;
  
-    @Column(name="RED_MENU_TYPE_NAME")
-    @ApiParam(value ="功能类型名称" , access ="功能类型名称")
-    private String redMenuTypeName;
- 
     @Column(name="PARENT_ID")
-    @ApiParam(value ="父级功能ID" , access ="父级功能ID" ,example = "0")
+    @ApiParam(value ="父级功能ID" , example = "0")
-    private long parentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
  
     @Column(name="RED_PARENT_NAME")
     @ApiParam(value ="父级功能名称" , access ="父级功能名称")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -41,12 +43,14 @@ public class SysMessage extends BaseBean {
     private String redMessageTypeName;
  
     @Column(name="MESSAGE_SEND_ID")
-    @ApiParam(value ="发送者" , access ="发送者")
+    @ApiParam(value ="发送者" , example = "0")
-    private String messageSendId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long messageSendId;
  
     @Column(name="MESSAGE_ACCEPT_ID")
-    @ApiParam(value ="接受者" , access ="接受者")
+    @ApiParam(value ="接收者"  , example = "0")
-    private String messageAcceptId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long messageAcceptId;
  
     @Column(name="MESSAGE_CONTENT")
     @ApiParam(value ="消息内容" , access ="消息内容")

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

@@ -23,7 +23,7 @@ import javax.persistence.Table;
 public class SysMethod extends BaseBean {
 
     @Column(name="method_code")
-    @ApiParam(value = "功能编码",example = "0001，和前台交互")
+    @ApiParam(value = "功能编码",example = "0")
     private Integer methodCode;
 
     @Column(name="method_name")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,13 +36,14 @@ public class SysRole extends BaseBean {
     @ApiParam(value ="角色等级（待定）" , example ="1" , access ="角色等级（待定）")
     private Integer roleGrade;
 
-    @Column(name="ROLE_PARENT_ID")
+    @Column(name="PARENT_ID")
-    @ApiParam(value ="角色父节点ID" , access ="角色父节点ID")
+    @ApiParam(value ="角色父节点ID" , example = "0")
-    private String roleParentId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
 
-    @Column(name="RED_ROLE_PARENT_ID")
+    @Column(name="RED_PARENT_NAME")
     @ApiParam(value ="角色父节点名称" , access ="角色父节点名称")
-    private String redRoleParentId;
+    private String redParentName;
 
     @Column(name="RED_MODULE_NAMES")
     @ApiParam(value ="权限模块名称" , access ="权限模块名称")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,16 +35,19 @@ public class SysUserInfo extends BaseBean {
     private String name;
  
     @Column(name="USER_ID")
-    @ApiParam(value ="用户ID" , access ="用户ID")
+    @ApiParam(value ="用户ID" , example = "0")
-    private String userId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userId;
  
     @Column(name="ORGANIZE_ID")
-    @ApiParam(value ="组织ID" , access ="组织ID")
+    @ApiParam(value ="组织ID" , example = "0")
-    private String organizeId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long organizeId;
  
     @Column(name="USER_IMAGE_ID")
-    @ApiParam(value ="用户图像" , access ="用户图像")
+    @ApiParam(value ="用户图像" , example = "0")
-    private String userImageId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long userImageId;
  
     @Column(name="USER_SEX")
     @ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）")
@@ -52,8 +57,8 @@ public class SysUserInfo extends BaseBean {
     @ApiParam(value ="年龄" , example ="1" , access ="年龄")
     private Integer userAge;
  
-    @Column(name="USER_LOGIN_LASTAAA_DATE_TIME")
+    @Column(name="USER_LOGIN_LAST_DATE_TIME")
     @ApiParam(value ="用户最后登录时间" , access ="用户最后登录时间")
-    private String userLoginLastaaaDateTime;
+    private String userLoginLastDateTime;
 
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -25,7 +27,7 @@ import java.text.DecimalFormat;
 @DynamicInsert
 @DynamicUpdate
 @Api(value="定时任务",description = "定时任务")
-public class TaskTimed extends BaseBean {
+public class TaskTime extends BaseBean {
 
  
     @Column(name="NAME")
@@ -33,8 +35,9 @@ public class TaskTimed extends BaseBean {
     private String name;
  
     @Column(name="TIME_ID")
-    @ApiParam(value ="时间表达式ID" , access ="时间表达式ID")
+    @ApiParam(value ="时间表达式ID" , example = "0")
-    private String timeId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long timeId;
  
     @Column(name="RED_TIME_NAME")
     @ApiParam(value ="时间表达式名称" , access ="时间表达式名称")

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

@@ -13,7 +13,7 @@ import javax.persistence.Table;
 import java.text.DecimalFormat;
 
 /**
- * @Description : 系统时间表达式
+ * @Description : 定时任务时间表达式
  * @Reference   :
  * @Author      : wei.peng
  * @Date        : 2018-10-22 16:58:43.801
@@ -21,11 +21,11 @@ import java.text.DecimalFormat;
  **/
 @Data
 @Entity
-@Table(name="SYS_TIME_EXPRESSION")
+@Table(name="Task_TIME_EXPRESSION")
 @DynamicInsert
 @DynamicUpdate
 @Api(value="系统时间表达式",description = "系统时间表达式")
-public class SysTimeExpression extends BaseBean {
+public class TaskTimeExpression extends BaseBean {
 
  
     @Column(name="NAME")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -25,7 +27,7 @@ import java.text.DecimalFormat;
 @DynamicInsert
 @DynamicUpdate
 @Api(value="定时任务执行记录",description = "定时任务执行记录")
-public class TaskTimedRecording extends BaseBean {
+public class TaskTimeRecording extends BaseBean {
 
  
     @Column(name="NAME")
@@ -33,11 +35,13 @@ public class TaskTimedRecording extends BaseBean {
     private String name;
  
     @Column(name="TIMED_TASK_ID")
-    @ApiParam(value ="任务编号" , access ="任务编号")
+    @ApiParam(value ="任务编号" , example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String timedTaskId;
  
     @Column(name="RED_TIME_ID")
-    @ApiParam(value ="时间表达式ID" , access ="时间表达式ID")
+    @ApiParam(value ="时间表达式ID" , example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private String redTimeId;
  
     @Column(name="RED_TIME_EXPRESSION")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,8 +35,9 @@ public class Tool extends BaseBean {
     private String name;
  
     @Column(name="TOOL_TYPE_ID")
-    @ApiParam(value ="类型ID" , access ="类型ID")
+    @ApiParam(value ="类型ID" , example = "0")
-    private String toolTypeId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long toolTypeId;
  
     @Column(name="RED_TOOL_TYPE_NAME")
     @ApiParam(value ="类型名称" , access ="类型名称")