diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/JacksonConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/JacksonConfig.java deleted file mode 100644 index d0eba50..0000000 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/JacksonConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ruoyi.common.config; - -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class JacksonConfig { - @Bean - public ObjectMapper jacksonObjectMapper() { - ObjectMapper mapper = new ObjectMapper(); - // 将 Long 类型序列化为 String - SimpleModule module = new SimpleModule(); - module.addSerializer(Long.class, new ToStringSerializer()); - module.addSerializer(long.class, new ToStringSerializer()); - mapper.registerModule(module); - - // 忽略实体中没有的字段(不抛出异常) - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - return mapper; - } -} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java index a180a18..f6b1e94 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -1,11 +1,14 @@ package com.ruoyi.common.core.domain; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + import java.util.ArrayList; import java.util.List; /** * Tree基类 - * + * * @author ruoyi */ public class TreeEntity extends BaseEntity @@ -16,6 +19,7 @@ public class TreeEntity extends BaseEntity private String parentName; /** 父菜单ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long parentId; /** 显示顺序 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java index ae25df2..e1edf69 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java @@ -4,6 +4,8 @@ import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.domain.entity.SysMenu; @@ -11,7 +13,7 @@ import com.ruoyi.common.utils.StringUtils; /** * Treeselect树结构实体类 - * + * * @author ruoyi */ public class TreeSelect implements Serializable @@ -19,6 +21,7 @@ public class TreeSelect implements Serializable private static final long serialVersionUID = 1L; /** 节点ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 节点名称 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index fb18c5c..63e5089 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -6,13 +6,16 @@ import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.domain.BaseEntity; /** * 部门表 sys_dept - * + * * @author ruoyi */ public class SysDept extends BaseEntity @@ -20,9 +23,11 @@ public class SysDept extends BaseEntity private static final long serialVersionUID = 1L; /** 部门ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long deptId; /** 父部门ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long parentId; /** 祖级列表 */ @@ -51,7 +56,7 @@ public class SysDept extends BaseEntity /** 父部门名称 */ private String parentName; - + /** 子部门 */ private List children = new ArrayList(); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index c3ba32b..cf4b981 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -2,6 +2,9 @@ package com.ruoyi.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -20,6 +23,7 @@ public class SysDictData extends BaseEntity /** 字典编码 */ @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) + @JsonSerialize(using = ToStringSerializer.class) private Long dictCode; /** 字典排序 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index e324fcf..cafdeef 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -3,6 +3,9 @@ package com.ruoyi.common.core.domain.entity; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,7 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 字典类型表 sys_dict_type - * + * * @author ruoyi */ public class SysDictType extends BaseEntity @@ -20,6 +23,7 @@ public class SysDictType extends BaseEntity /** 字典主键 */ @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) + @JsonSerialize(using = ToStringSerializer.class) private Long dictId; /** 字典名称 */ @@ -78,7 +82,7 @@ public class SysDictType extends BaseEntity { this.status = status; } - + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index ad73692..ed9c38c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -5,13 +5,16 @@ import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.domain.BaseEntity; /** * 菜单权限表 sys_menu - * + * * @author ruoyi */ public class SysMenu extends BaseEntity @@ -19,6 +22,7 @@ public class SysMenu extends BaseEntity private static final long serialVersionUID = 1L; /** 菜单ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long menuId; /** 菜单名称 */ @@ -28,6 +32,7 @@ public class SysMenu extends BaseEntity private String parentName; /** 父菜单ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long parentId; /** 显示顺序 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 7d38a38..07a8476 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -4,6 +4,9 @@ import java.util.Set; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -21,6 +24,7 @@ public class SysRole extends BaseEntity /** 角色ID */ @Excel(name = "角色序号", cellType = ColumnType.NUMERIC) + @JsonSerialize(using = ToStringSerializer.class) private Long roleId; /** 角色名称 */ @@ -56,9 +60,11 @@ public class SysRole extends BaseEntity private boolean flag = false; /** 菜单组 */ + @JsonSerialize(using = ToStringSerializer.class) private Long[] menuIds; /** 部门组(数据权限) */ + @JsonSerialize(using = ToStringSerializer.class) private Long[] deptIds; /** 角色菜单权限 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index b603478..11302e9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -3,6 +3,9 @@ package com.ruoyi.common.core.domain.entity; import java.util.Date; import java.util.List; import javax.validation.constraints.*; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -21,12 +24,17 @@ public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; - /** 用户ID */ + /** + * 用户ID + */ @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号") + @JsonSerialize(using = ToStringSerializer.class) private Long userId; + /** 部门ID */ @Excel(name = "部门编号", type = Type.IMPORT) + @JsonSerialize(using = ToStringSerializer.class) private Long deptId; /** 用户账号 */ @@ -81,14 +89,17 @@ public class SysUser extends BaseEntity private List roles; /** 角色组 */ + @JsonSerialize(using = ToStringSerializer.class) private Long[] roleIds; /** 岗位组 */ + @JsonSerialize(using = ToStringSerializer.class) private Long[] postIds; /** 角色ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long roleId; - + private boolean admin; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java index 670e6b3..e128f23 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -1,6 +1,8 @@ package com.ruoyi.common.core.domain.model; import com.alibaba.fastjson2.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.ruoyi.common.core.domain.entity.SysUser; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @@ -9,7 +11,7 @@ import java.util.Set; /** * 登录用户身份权限 - * + * * @author ruoyi */ public class LoginUser implements UserDetails @@ -19,11 +21,13 @@ public class LoginUser implements UserDetails /** * 用户ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long userId; /** * 部门ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long deptId; /** @@ -144,7 +148,7 @@ public class LoginUser implements UserDetails /** * 指定用户是否解锁,锁定的用户无法进行身份验证 - * + * * @return */ @JSONField(serialize = false) @@ -156,7 +160,7 @@ public class LoginUser implements UserDetails /** * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证 - * + * * @return */ @JSONField(serialize = false) @@ -168,7 +172,7 @@ public class LoginUser implements UserDetails /** * 是否可用 ,禁用的用户不能身份验证 - * + * * @return */ @JSONField(serialize = false) diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java index 022a54d..db8ab72 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -3,6 +3,9 @@ package com.ruoyi.generator.domain; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotBlank; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.ArrayUtils; import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.core.domain.BaseEntity; @@ -10,7 +13,7 @@ import com.ruoyi.common.utils.StringUtils; /** * 业务表 gen_table - * + * * @author ruoyi */ public class GenTable extends BaseEntity @@ -18,6 +21,7 @@ public class GenTable extends BaseEntity private static final long serialVersionUID = 1L; /** 编号 */ + @JsonSerialize(using = ToStringSerializer.class) private Long tableId; /** 表名称 */ @@ -93,6 +97,7 @@ public class GenTable extends BaseEntity private String treeName; /** 上级菜单ID字段 */ + @JsonSerialize(using = ToStringSerializer.class) private Long parentMenuId; /** 上级菜单名称字段 */ @@ -382,4 +387,4 @@ public class GenTable extends BaseEntity } return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); } -} \ No newline at end of file +} diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java index d1733b6..eb89231 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java @@ -1,12 +1,15 @@ package com.ruoyi.generator.domain; import javax.validation.constraints.NotBlank; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.utils.StringUtils; /** * 代码生成业务字段表 gen_table_column - * + * * @author ruoyi */ public class GenTableColumn extends BaseEntity @@ -14,9 +17,11 @@ public class GenTableColumn extends BaseEntity private static final long serialVersionUID = 1L; /** 编号 */ + @JsonSerialize(using = ToStringSerializer.class) private Long columnId; /** 归属表编号 */ + @JsonSerialize(using = ToStringSerializer.class) private Long tableId; /** 列名称 */ diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java index 1f49695..4efff27 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java @@ -3,6 +3,9 @@ package com.ruoyi.quartz.domain; import java.util.Date; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; @@ -15,7 +18,7 @@ import com.ruoyi.quartz.util.CronUtils; /** * 定时任务调度表 sys_job - * + * * @author ruoyi */ public class SysJob extends BaseEntity @@ -24,6 +27,7 @@ public class SysJob extends BaseEntity /** 任务ID */ @Excel(name = "任务序号", cellType = ColumnType.NUMERIC) + @JsonSerialize(using = ToStringSerializer.class) private Long jobId; /** 任务名称 */ diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java index 121c035..995e54e 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java @@ -1,6 +1,9 @@ package com.ruoyi.quartz.domain; import java.util.Date; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -8,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log - * + * * @author ruoyi */ public class SysJobLog extends BaseEntity @@ -17,6 +20,7 @@ public class SysJobLog extends BaseEntity /** ID */ @Excel(name = "日志序号") + @JsonSerialize(using = ToStringSerializer.class) private Long jobLogId; /** 任务名称 */ @@ -128,7 +132,7 @@ public class SysJobLog extends BaseEntity { this.startTime = startTime; } - + public Date getStopTime() { return stopTime; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index c54678c..3b20c61 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -2,6 +2,9 @@ package com.ruoyi.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -10,7 +13,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 参数配置表 sys_config - * + * * @author ruoyi */ public class SysConfig extends BaseEntity @@ -19,6 +22,7 @@ public class SysConfig extends BaseEntity /** 参数主键 */ @Excel(name = "参数主键", cellType = ColumnType.NUMERIC) + @JsonSerialize(using = ToStringSerializer.class) private Long configId; /** 参数名称 */ @@ -92,7 +96,7 @@ public class SysConfig extends BaseEntity { this.configType = configType; } - + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index 7fdea30..0f5c456 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -2,13 +2,15 @@ package com.ruoyi.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor - * + * * @author ruoyi */ public class SysLogininfor extends BaseEntity @@ -17,6 +19,7 @@ public class SysLogininfor extends BaseEntity /** ID */ @Excel(name = "序号", cellType = ColumnType.NUMERIC) + @JsonSerialize(using = ToStringSerializer.class) private Long infoId; /** 用户账号 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 8c07a54..7887309 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -2,6 +2,9 @@ package com.ruoyi.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.domain.BaseEntity; @@ -9,7 +12,7 @@ import com.ruoyi.common.xss.Xss; /** * 通知公告表 sys_notice - * + * * @author ruoyi */ public class SysNotice extends BaseEntity @@ -17,6 +20,7 @@ public class SysNotice extends BaseEntity private static final long serialVersionUID = 1L; /** 公告ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long noticeId; /** 公告标题 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index f6761df..5ebafdd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -2,13 +2,15 @@ package com.ruoyi.system.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; /** * 操作日志记录表 oper_log - * + * * @author ruoyi */ public class SysOperLog extends BaseEntity @@ -17,6 +19,7 @@ public class SysOperLog extends BaseEntity /** 日志主键 */ @Excel(name = "操作序号", cellType = ColumnType.NUMERIC) + @JsonSerialize(using = ToStringSerializer.class) private Long operId; /** 操作模块 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 820a13b..d2f28bf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -3,6 +3,9 @@ package com.ruoyi.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -11,7 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 岗位表 sys_post - * + * * @author ruoyi */ public class SysPost extends BaseEntity @@ -20,6 +23,7 @@ public class SysPost extends BaseEntity /** 岗位序号 */ @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) + @JsonSerialize(using = ToStringSerializer.class) private Long postId; /** 岗位编码 */ @@ -105,7 +109,7 @@ public class SysPost extends BaseEntity { this.flag = flag; } - + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java index 47b21bf..8ad0b24 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java @@ -1,19 +1,23 @@ package com.ruoyi.system.domain; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept - * + * * @author ruoyi */ public class SysRoleDept { /** 角色ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long roleId; - + /** 部门ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long deptId; public Long getRoleId() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java index de10a74..84a215f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java @@ -1,19 +1,23 @@ package com.ruoyi.system.domain; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和菜单关联 sys_role_menu - * + * * @author ruoyi */ public class SysRoleMenu { /** 角色ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long roleId; - + /** 菜单ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long menuId; public Long getRoleId() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java index 6e8c416..75ab155 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java @@ -1,19 +1,23 @@ package com.ruoyi.system.domain; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post - * + * * @author ruoyi */ public class SysUserPost { /** 用户ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long userId; - + /** 岗位ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long postId; public Long getUserId() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java index 4d15810..890f96d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java @@ -1,19 +1,23 @@ package com.ruoyi.system.domain; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role - * + * * @author ruoyi */ public class SysUserRole { /** 用户ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long userId; - + /** 角色ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long roleId; public Long getUserId()