From 6b6d6ae16c652285e0bf3a36cd577f38f5a80ce9 Mon Sep 17 00:00:00 2001 From: zlg <482370576@qq.com> Date: Sat, 20 Apr 2024 00:45:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=AC=E6=8D=A2=E5=99=A8=E5=92=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/SchisandraAuthPermissionDTO.java | 20 ++++++++++++++++- .../dto/SchisandraAuthRoleDTO.java | 22 +++++++++++++++++++ .../dto/SchisandraAuthUserDTO.java | 2 ++ .../domain/bo/SchisandraAuthPermissionBO.java | 20 ++++++++++++++++- .../auth/domain/bo/SchisandraAuthRoleBO.java | 21 ++++++++++++++++++ .../auth/domain/bo/SchisandraAuthUserBO.java | 2 ++ ...SchisandraAuthPermissionDomainService.java | 3 ++- ...sandraAuthPermissionDomainServiceImpl.java | 5 ++++- 8 files changed, 91 insertions(+), 4 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java index 42830f8..8cda265 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthPermissionDTO.java @@ -1,5 +1,6 @@ package com.schisandra.auth.application.dto; +import lombok.Builder; import lombok.Data; import java.util.Date; @@ -11,6 +12,7 @@ import java.io.Serializable; * @since 2024-04-17 12:05:46 */ @Data +//@Builder public class SchisandraAuthPermissionDTO implements Serializable { private Long id; @@ -30,11 +32,27 @@ public class SchisandraAuthPermissionDTO implements Serializable { private String icon; private String permissionKey; - + /** + * 创建人 + */ + private String createdBy; + /** + * 创建时间 + */ + private Date createdTime; + /** + * 更新人 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; private Integer isDeleted; + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthRoleDTO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthRoleDTO.java index e935e58..e853eb9 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthRoleDTO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthRoleDTO.java @@ -1,8 +1,10 @@ package com.schisandra.auth.application.dto; +import lombok.Builder; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * ClassName:SchisandraAuthRoleDTO @@ -14,6 +16,7 @@ import java.io.Serializable; * @Version: v1.0 */ @Data +//@Builder public class SchisandraAuthRoleDTO implements Serializable { /** * id @@ -30,6 +33,25 @@ public class SchisandraAuthRoleDTO implements Serializable { */ private String roleKey; + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; /** * 是否删除 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthUserDTO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthUserDTO.java index c772ccd..6b67f05 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthUserDTO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-controller/src/main/java/com/schisandra/auth/application/dto/SchisandraAuthUserDTO.java @@ -1,5 +1,6 @@ package com.schisandra.auth.application.dto; +import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -11,6 +12,7 @@ import java.io.Serializable; * @since 2024-03-21 20:15:43 */ @Data +//@Builder public class SchisandraAuthUserDTO implements Serializable { /** diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java index b6e5e5a..866b651 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthPermissionBO.java @@ -1,9 +1,10 @@ package com.schisandra.auth.domain.bo; +import lombok.Builder; import lombok.Data; -import java.util.Date; import java.io.Serializable; +import java.util.Date; /** * (SchisandraAuthPermission)实体类 @@ -32,11 +33,28 @@ public class SchisandraAuthPermissionBO implements Serializable { private String icon; private String permissionKey; + /** + * 创建人 + */ + private String createdBy; + /** + * 创建时间 + */ + private Date createdTime; + /** + * 更新人 + */ + private String updateBy; + /** + * 更新时间 + */ + private Date updateTime; private Integer isDeleted; + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthRoleBO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthRoleBO.java index 16d9c2b..8fae9db 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthRoleBO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthRoleBO.java @@ -1,5 +1,6 @@ package com.schisandra.auth.domain.bo; +import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -17,6 +18,7 @@ import java.util.Date; * @Version: v1.0 */ @Data +//@Builder public class SchisandraAuthRoleBO implements Serializable { /** * id @@ -33,6 +35,25 @@ public class SchisandraAuthRoleBO implements Serializable { */ private String roleKey; + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; /** * 是否删除 diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthUserBO.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthUserBO.java index a3cc80f..320461e 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthUserBO.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/bo/SchisandraAuthUserBO.java @@ -1,5 +1,6 @@ package com.schisandra.auth.domain.bo; +import lombok.Builder; import lombok.Data; import java.io.Serializable; @@ -12,6 +13,7 @@ import java.util.Date; * @since 2024-03-21 20:15:43 */ @Data +//@Builder public class SchisandraAuthUserBO implements Serializable { /** diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java index f737f04..7091ab2 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/SchisandraAuthPermissionDomainService.java @@ -1,12 +1,13 @@ package com.schisandra.auth.domain.service; import com.schisandra.auth.domain.bo.SchisandraAuthPermissionBO; +import com.schisandra.auth.infra.basic.entity.SchisandraAuthPermission; public interface SchisandraAuthPermissionDomainService { Object update(SchisandraAuthPermissionBO schisandraAuthPermissionBO); Object delete(SchisandraAuthPermissionBO schisandraAuthPermissionBO); Object insert(SchisandraAuthPermissionBO schisandraAuthPermissionBO); - Object select(SchisandraAuthPermissionBO schisandraAuthPermissionBO); + SchisandraAuthPermission select(SchisandraAuthPermissionBO schisandraAuthPermissionBO); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java index 1a2c9ce..4c4a107 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java @@ -8,9 +8,12 @@ import com.schisandra.auth.infra.basic.service.SchisandraAuthPermissionService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + @Service @Slf4j public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuthPermissionDomainService { + @Resource SchisandraAuthPermissionService schisandraAuthPermissionService; /** * @description: 更新 @@ -59,7 +62,7 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth * @date: 2024/4/17 17:07 */ @Override - public Object select(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { + public SchisandraAuthPermission select(SchisandraAuthPermissionBO schisandraAuthPermissionBO) { SchisandraAuthPermission schisandraAuthPermission = SchisandraAuthPermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthPermissionBO);