修改实体内关联id类型为Long

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

@@ -55,8 +55,9 @@ public class Department extends BaseBean {
     private String redOrganizeName;
  
     @Column(name="ORGANIZE_ID")
-    @ApiParam(value ="所属组织" , access ="所属组织")
+    @ApiParam(value ="所属组织" , example = "0")
-    private String organizeId;
+    @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;
@@ -42,7 +44,8 @@ public class Organize extends BaseBean {
  
     @Column(name="PARENT_ID")
     @ApiParam(value ="父节点" , access ="父节点" ,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/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/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;
@@ -37,7 +39,8 @@ public class SysMenu extends BaseBean {
     private Integer menuTypeId;
  
     @Column(name="PARENT_ID")
-    @ApiParam(value ="父级功能ID" , access ="父级功能ID" )
+    @ApiParam(value ="父级功能ID" , example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
  
     @Column(name="RED_PARENT_NAME")

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/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;
@@ -33,8 +35,9 @@ public class TaskTime 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/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;
@@ -33,11 +35,13 @@ public class TaskTimeRecording 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 ="类型名称")