From f979d93e7f4991f8b812e8903b2b546645d5c495 Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Tue, 25 Jun 2024 09:47:19 +0800 Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/das/modules/auth/entity/SysAuthority.java | 3 +++ das/src/main/java/com/das/modules/auth/entity/SysMenu.java | 3 +++ das/src/main/java/com/das/modules/auth/entity/SysOrg.java | 5 ++++- das/src/main/java/com/das/modules/auth/entity/SysRole.java | 3 +++ das/src/main/java/com/das/modules/auth/entity/SysUser.java | 3 +++ .../das/modules/auth/service/impl/SysMenuServiceImpl.java | 5 +++++ .../com/das/modules/auth/service/impl/SysOrgServiceImpl.java | 5 +++++ .../das/modules/auth/service/impl/SysUserServiceImpl.java | 5 +++++ das/src/main/resources/mapper/SysOrgMapper.xml | 4 ++-- 9 files changed, 33 insertions(+), 3 deletions(-) diff --git a/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java b/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java index d74acdda..d1ed7d6e 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java @@ -2,6 +2,8 @@ package com.das.modules.auth.entity; import com.baomidou.mybatisplus.annotation.*; import com.das.common.constant.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,6 +29,7 @@ public class SysAuthority extends BaseEntity { * 用户ID */ @TableId(value = "id", type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/das/src/main/java/com/das/modules/auth/entity/SysMenu.java b/das/src/main/java/com/das/modules/auth/entity/SysMenu.java index 7bc147a0..8ca9f09d 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysMenu.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysMenu.java @@ -2,6 +2,8 @@ package com.das.modules.auth.entity; import com.baomidou.mybatisplus.annotation.*; import com.das.common.constant.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -28,6 +30,7 @@ public class SysMenu extends BaseEntity { /** 菜单ID */ @TableId(value = "id", type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) private Long id ; /** 菜单名称 */ diff --git a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java index 59834ead..741b28f5 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysOrg.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysOrg.java @@ -2,6 +2,8 @@ package com.das.modules.auth.entity; import com.baomidou.mybatisplus.annotation.*; import com.das.common.constant.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -31,6 +33,7 @@ public class SysOrg extends BaseEntity { * 机构ID */ @TableId(value = "id", type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** @@ -86,7 +89,7 @@ public class SysOrg extends BaseEntity { * 上级机构id */ @TableField("parent_org_id") - private Long parentOrgID; + private Long parentOrgId; /** * 乐观锁 diff --git a/das/src/main/java/com/das/modules/auth/entity/SysRole.java b/das/src/main/java/com/das/modules/auth/entity/SysRole.java index 8cc601aa..ce02e515 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysRole.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysRole.java @@ -2,6 +2,8 @@ package com.das.modules.auth.entity; import com.baomidou.mybatisplus.annotation.*; import com.das.common.constant.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -27,6 +29,7 @@ public class SysRole extends BaseEntity { * 用户ID */ @TableId(value = "id", type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/das/src/main/java/com/das/modules/auth/entity/SysUser.java b/das/src/main/java/com/das/modules/auth/entity/SysUser.java index 1c38912f..84d67db6 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysUser.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysUser.java @@ -2,6 +2,8 @@ package com.das.modules.auth.entity; import com.baomidou.mybatisplus.annotation.*; import com.das.common.constant.BaseEntity; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.*; import org.springframework.format.annotation.DateTimeFormat; @@ -29,6 +31,7 @@ public class SysUser extends BaseEntity { * 用户ID */ @TableId(value = "id", type = IdType.ASSIGN_ID) + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java index 3665f7f7..2f020a58 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java @@ -14,6 +14,8 @@ import com.das.modules.auth.service.SysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; + @Service public class SysMenuServiceImpl implements SysMenuService { @@ -24,6 +26,9 @@ public class SysMenuServiceImpl implements SysMenuService { SysMenu sysMenu = new SysMenu(); BeanCopyUtils.copy(sysMenuDto,sysMenu); sysMenu.setId(SequenceUtils.generateId()); + sysMenu.setRevision(1); + sysMenu.setCreatedTime(new Date()); + sysMenu.setUpdatedTime(new Date()); sysMenuMapper.insert(sysMenu); return sysMenu; } diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java index 8091cca5..e451f364 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java @@ -12,6 +12,8 @@ import com.das.modules.auth.service.SysOrgService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; + @Service public class SysOrgServiceImpl implements SysOrgService { @Autowired @@ -22,6 +24,9 @@ public class SysOrgServiceImpl implements SysOrgService { SysOrg sysOrg = new SysOrg(); BeanCopyUtils.copy(sysOrgDto,sysOrg); sysOrg.setId(SequenceUtils.generateId()); + sysOrg.setRevision(1); + sysOrg.setCreatedTime(new Date()); + sysOrg.setUpdatedTime(new Date()); sysOrgMapper.insert(sysOrg); return sysOrg; } diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java index da18e593..63497e7b 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java @@ -14,6 +14,8 @@ import com.das.modules.auth.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; + @Service public class SysUserServiceImpl implements SysUserService { @@ -24,6 +26,9 @@ public class SysUserServiceImpl implements SysUserService { SysUser sysUser = new SysUser(); BeanCopyUtils.copy(sysUserDto,sysUser); sysUser.setId(SequenceUtils.generateId()); + sysUser.setRevision(1); + sysUser.setCreatedTime(new Date()); + sysUser.setUpdatedTime(new Date()); sysUserMapper.insert(sysUser); return sysUser; } diff --git a/das/src/main/resources/mapper/SysOrgMapper.xml b/das/src/main/resources/mapper/SysOrgMapper.xml index d9544322..bce13779 100644 --- a/das/src/main/resources/mapper/SysOrgMapper.xml +++ b/das/src/main/resources/mapper/SysOrgMapper.xml @@ -35,8 +35,8 @@ and county like concat('%',#{sysOrg.county},'%') - - and parent_org_iD = #{sysOrg.parentOrgID} + + and parent_org_id = #{sysOrg.parentOrgId}